Ignore lint warning for getDiscriminatedUnion

microsoft · Feb 27, 2025 · fb08dfa · fb08dfa
1 parent aa6bddb
commit fb08dfa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/packages/emitter-framework/src/typescript/components/type-transform.tsx b/packages/emitter-framework/src/typescript/components/type-transform.tsx
@@ -55,6 +55,7 @@ interface DiscriminateExpressionProps {
 }
 
 function DiscriminateExpression(props: DiscriminateExpressionProps) {
+  // eslint-disable-next-line @typescript-eslint/no-deprecated
   const [discriminatedUnion] = getDiscriminatedUnion(props.type, props.discriminator)!;
 
   const discriminatorRef = `item.${props.discriminator.propertyName}`;

diff --git a/packages/http-client-js/src/components/transforms/json/json-transform-discriminator.tsx b/packages/http-client-js/src/components/transforms/json/json-transform-discriminator.tsx
@@ -5,7 +5,6 @@ import {
   DiscriminatedUnionLegacy,
   Discriminator,
   getDiscriminatedUnion,
-  ignoreDiagnostics,
   Model,
   Union,
 } from "@typespec/compiler";
@@ -30,7 +29,8 @@ export function JsonTransformDiscriminator(props: JsonTransformDiscriminatorProp
   let propertyName: string | undefined = discriminatedUnion?.options.discriminatorPropertyName;
   if (!discriminatedUnion && props.discriminator) {
     // eslint-disable-next-line @typescript-eslint/no-deprecated
-    discriminatedUnion = ignoreDiagnostics(getDiscriminatedUnion(props.type, props.discriminator));
+    const [result] = getDiscriminatedUnion(props.type, props.discriminator);
+    discriminatedUnion = result;
     propertyName = props.discriminator.propertyName;
   }
 

diff --git a/packages/http-client/src/typekit/kits/model.ts b/packages/http-client/src/typekit/kits/model.ts
@@ -1,10 +1,4 @@
-import {
-  getDiscriminatedUnion,
-  getDiscriminator,
-  ignoreDiagnostics,
-  Model,
-  ModelProperty,
-} from "@typespec/compiler";
+import { getDiscriminatedUnion, getDiscriminator, Model, ModelProperty } from "@typespec/compiler";
 import { defineKit } from "@typespec/compiler/experimental/typekit";
 import { AccessKit, getAccess, getName, getUsage, NameKit, UsageKit } from "./utils.js";
 
@@ -83,7 +77,8 @@ defineKit<SdkKit>({
     getDiscriminatedSubtypes(model) {
       const disc = getDiscriminator(this.program, model);
       if (!disc) return {};
-      const discriminatedUnion = ignoreDiagnostics(getDiscriminatedUnion(model, disc));
+      // eslint-disable-next-line @typescript-eslint/no-deprecated
+      const [discriminatedUnion] = getDiscriminatedUnion(model, disc);
       return discriminatedUnion?.variants || {};
     },
     getBaseModel(model) {