@azure-tools/typespec-ts 0.12.0-alpha.20230502.1 → 0.13.0

package/test/unit/modelsGenerator.spec.ts

@@ -718,8 +718,142 @@ describe("Input/output model type", () => {
     });
   });
   describe("duration generation", () => {
-    it("should handle duration -> string", async () => {
-      await verifyPropertyType("duration", "string");
+    const buildParameterDef = (type: string) => {
+      return `
+      import { RequestParameters } from "@azure-rest/core-client";
+      
+      export interface GetModelQueryParamProperties {
+        "input": ${type};
+      }
+
+      export interface GetModelQueryParam {
+        queryParameters: GetModelQueryParamProperties;
+      }
+      
+      export type GetModelParameters = GetModelQueryParam & RequestParameters;
+      `;
+    };
+
+    describe("as input and output model property", () => {
+      it("should handle duration without encode", async () => {
+        await verifyPropertyType("duration", "string");
+      });
+
+      it("should handle duration with encode `seconds`", async () => {
+        const schemaOutput = await emitModelsFromCadl(
+          `
+        model SimpleModel {
+          @encode("seconds", float64)
+          prop: duration;
+        }
+        @route("/duration/prop/seconds")
+        @get
+        op getModel(...SimpleModel): SimpleModel;
+        `,
+          false,
+          true
+        );
+        assert.ok(schemaOutput);
+        const { inputModelFile, outputModelFile } = schemaOutput!;
+        assertEqualContent(
+          inputModelFile?.content!,
+          `
+        export interface SimpleModel { 
+          "prop": number;
+        }
+        `
+        );
+        assertEqualContent(
+          outputModelFile?.content!,
+          `
+        export interface SimpleModelOutput { 
+          "prop": number;
+        }
+        `
+        );
+      });
+
+      it("should handle duration with encode `iso8601`", async () => {
+        const schemaOutput = await emitModelsFromCadl(
+          `
+        model SimpleModel {
+          @encode("ISO8601")
+          prop: duration;
+        }
+        @route("/duration/prop/iso8601")
+        @get
+        op getModel(...SimpleModel): SimpleModel;
+        `,
+          false,
+          true
+        );
+        assert.ok(schemaOutput);
+        const { inputModelFile, outputModelFile } = schemaOutput!;
+        assertEqualContent(
+          inputModelFile?.content!,
+          `
+        export interface SimpleModel { 
+          "prop": string;
+        }
+        `
+        );
+        assertEqualContent(
+          outputModelFile?.content!,
+          `
+        export interface SimpleModelOutput { 
+          "prop": string;
+        }
+        `
+        );
+      });
+    });
+
+    describe("as query parameter", () => {
+      it("should handle duration without encode", async () => {
+        const schemaOutput = await emitParameterFromCadl(`
+        @route("/duration/query/default")
+        @get
+        op getModel(@query input: duration): NoContentResponse;
+        `);
+        assert.ok(schemaOutput);
+        assertEqualContent(schemaOutput?.content!, buildParameterDef("string"));
+      });
+
+      it("should handle duration with encode `seconds`", async () => {
+        const schemaOutput = await emitParameterFromCadl(
+          `
+        @route("/duration/query/seconds")
+        @get
+        op getModel(
+          @query
+          @encode("seconds", float64)
+          input: duration): NoContentResponse;
+        `,
+          false,
+          false,
+          true
+        );
+        assert.ok(schemaOutput);
+        assertEqualContent(schemaOutput?.content!, buildParameterDef("number"));
+      });
+
+      it("should handle duration with encode `iso8601`", async () => {
+        const schemaOutput = await emitParameterFromCadl(
+          `
+        @route("/duration/query/iso8601")
+        @get
+        op getModel(
+          @query
+          @encode("iso8601")
+          input: duration): NoContentResponse;
+        `,
+          false,
+          false,
+          true
+        );
+        assert.ok(schemaOutput);
+        assertEqualContent(schemaOutput?.content!, buildParameterDef("string"));
+      });
     });
   });
   describe("datetime generation", () => {
@@ -744,6 +878,82 @@ describe("Input/output model type", () => {
         outputType
       });
     });
+
+    it("should handle offsetDateTime  -> string in output model &  `Date | string` in input model", async () => {
+      const inputType = "Date | string";
+      const outputType = "string";
+      await verifyPropertyType("offsetDateTime ", inputType, {
+        outputType
+      });
+    });
+
+    it("should handle datetime with encode `unixTimestamp`", async () => {
+      const schemaOutput = await emitModelsFromCadl(
+        `
+      model SimpleModel {
+        @encode("unixTimestamp", int32)
+        createdAt: utcDateTime;
+      }
+      @route("/datetime/prop/unixTimestamp")
+      @get
+      op getModel(...SimpleModel): SimpleModel;
+      `,
+        false,
+        true
+      );
+      assert.ok(schemaOutput);
+      const { inputModelFile, outputModelFile } = schemaOutput!;
+      assertEqualContent(
+        inputModelFile?.content!,
+        `
+      export interface SimpleModel { 
+        "createdAt": number;
+      }
+      `
+      );
+      assertEqualContent(
+        outputModelFile?.content!,
+        `
+      export interface SimpleModelOutput { 
+        "createdAt": number;
+      }
+      `
+      );
+    });
+
+    it("should handle datetime with encode `rfc3339`", async () => {
+      const schemaOutput = await emitModelsFromCadl(
+        `
+        model SimpleModel {
+          @encode("rfc3339")
+          createdAt: offsetDateTime;
+        }
+        @route("/datetime/prop/rfc3339")
+        @get
+        op getModel(...SimpleModel): SimpleModel;
+      `,
+        false,
+        true
+      );
+      assert.ok(schemaOutput);
+      const { inputModelFile, outputModelFile } = schemaOutput!;
+      assertEqualContent(
+        inputModelFile?.content!,
+        `
+      export interface SimpleModel { 
+        "createdAt": Date | string;
+      }
+      `
+      );
+      assertEqualContent(
+        outputModelFile?.content!,
+        `
+      export interface SimpleModelOutput { 
+        "createdAt": string;
+      }
+      `
+      );
+    });
   });
   describe("record generation", () => {
     it("should handle Record<int32> -> Record<string, number>", async () => {

package/test/unit/util/emitUtil.ts

@@ -19,9 +19,16 @@ import { getCredentialInfo } from "../../../src/transform/transfromRLCOptions.js
 
 export async function emitModelsFromCadl(
   cadlContent: string,
-  needAzureCore: boolean = false
+  needAzureCore: boolean = false,
+  needTCGC: boolean = false
 ) {
-  const context = await rlcEmitterFor(cadlContent, true, needAzureCore);
+  const context = await rlcEmitterFor(
+    cadlContent,
+    true,
+    needAzureCore,
+    false,
+    needTCGC
+  );
   const program = context.program;
   const dpgContext = createDpgContextTestHelper(context.program);
   const clients = listClients(dpgContext);
@@ -40,13 +47,15 @@ export async function emitModelsFromCadl(
 export async function emitParameterFromCadl(
   cadlContent: string,
   needAzureCore: boolean = false,
-  ignoreClientApiVersion: boolean = false
+  ignoreClientApiVersion: boolean = false,
+  needTCGC: boolean = false
 ) {
   const context = await rlcEmitterFor(
     cadlContent,
     true,
     needAzureCore,
-    ignoreClientApiVersion
+    ignoreClientApiVersion,
+    needTCGC
   );
   const program = context.program;
   const dpgContext = createDpgContextTestHelper(context.program);

package/test/unit/util/testUtil.ts

@@ -5,6 +5,7 @@ import { RestTestLibrary } from "@typespec/rest/testing";
 import { HttpTestLibrary } from "@typespec/http/testing";
 import { VersioningTestLibrary } from "@typespec/versioning/testing";
 import { AzureCoreTestLibrary } from "@azure-tools/typespec-azure-core/testing";
+import { SdkTestLibrary } from "@azure-tools/typespec-client-generator-core/testing";
 import { SdkContext } from "@azure-tools/typespec-client-generator-core";
 import { assert } from "chai";
 import { format } from "prettier";
@@ -16,7 +17,8 @@ export async function createRLCEmitterTestHost() {
       HttpTestLibrary,
       RestTestLibrary,
       VersioningTestLibrary,
-      AzureCoreTestLibrary
+      AzureCoreTestLibrary,
+      SdkTestLibrary
     ]
   });
 }
@@ -25,7 +27,8 @@ export async function rlcEmitterFor(
   code: string,
   needNamespaces: boolean = true,
   needAzureCore: boolean = false,
-  ignoreClientApiVersion: boolean = false
+  ignoreClientApiVersion: boolean = false,
+  needTCGC: boolean = false
 ): Promise<TestHost> {
   const host: TestHost = await createRLCEmitterTestHost();
   const namespace = `
@@ -34,6 +37,7 @@ export async function rlcEmitterFor(
     ${ignoreClientApiVersion ? "" : 'version: "2022-12-16-preview",'}
   })
 
+  ${needAzureCore ? "@useDependency(Azure.Core.Versions.v1_0_Preview_2)" : ""} 
   namespace Azure.TypeScript.Testing;
   `;
   host.addTypeSpecFile(
@@ -42,6 +46,7 @@ export async function rlcEmitterFor(
   import "@typespec/http";
   import "@typespec/rest";
   import "@typespec/versioning";
+  ${needTCGC ? 'import "@azure-tools/typespec-client-generator-core";' : ""} 
   ${needAzureCore ? 'import "@azure-tools/typespec-azure-core";' : ""} 
 
   using TypeSpec.Rest; 

package/typespec-ts.build.log

@@ -1,2 +1 @@
 Invoking: tsc -p . 
-

package/test/integration/generated/internal/src/models.ts

@@ -1,8 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-/** This is a non-internal model only used by internal operation. */
-export interface ModelOnlyUsedByInternalOperation {
-  id: string;
-  name: string;
-}