makeKeyOf() helper (#2231)

Will reuse in #2214 and #2226
RobinTail · Dec 2, 2024 · e0f0932 · e0f0932
1 parent f5706d6
commit e0f0932
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -140,6 +140,10 @@ export default tsPlugin.config(
           selector: "Identifier[name='EqualsEqualsEqualsToken']",
           message: "use makeEqual() helper",
         },
+        {
+          selector: "Identifier[name='KeyOfKeyword']",
+          message: "use makeKeyOf() helper",
+        },
       ],
     },
   },

diff --git a/src/integration-helpers.ts b/src/integration-helpers.ts
@@ -139,17 +139,20 @@ export const makePublicClass = (
     ...statements,
   ]);
 
+export const makeKeyOf = (id: ts.Identifier) =>
+  f.createTypeOperatorNode(
+    ts.SyntaxKind.KeyOfKeyword,
+    f.createTypeReferenceNode(id),
+  );
+
 export const makeConditionalIndex = (
   subject: ts.Identifier,
   key: ts.TypeNode,
   fallback: ts.TypeNode,
 ) =>
   f.createConditionalTypeNode(
     key,
-    f.createTypeOperatorNode(
-      ts.SyntaxKind.KeyOfKeyword,
-      f.createTypeReferenceNode(subject),
-    ),
+    makeKeyOf(subject),
     f.createIndexedAccessTypeNode(f.createTypeReferenceNode(subject), key),
     fallback,
   );

diff --git a/src/integration.ts b/src/integration.ts
@@ -31,6 +31,7 @@ import {
   restToken,
   makeAnd,
   makeEqual,
+  makeKeyOf,
 } from "./integration-helpers";
 import { makeCleanId } from "./common-helpers";
 import { Method, methods } from "./method";
@@ -292,10 +293,7 @@ export class Integration {
     this.program.push(
       makePublicType(
         this.ids.methodPathType,
-        f.createTypeOperatorNode(
-          ts.SyntaxKind.KeyOfKeyword,
-          f.createTypeReferenceNode(this.ids.inputInterface),
-        ),
+        makeKeyOf(this.ids.inputInterface),
       ),
     );
 
@@ -402,10 +400,7 @@ export class Integration {
           [this.ids.pathParameter.text]: f.createTypeReferenceNode("P"),
           [this.ids.paramsArgument.text]: f.createConditionalTypeNode(
             parametricIndexNode,
-            f.createTypeOperatorNode(
-              ts.SyntaxKind.KeyOfKeyword,
-              f.createTypeReferenceNode(this.ids.inputInterface),
-            ),
+            makeKeyOf(this.ids.inputInterface),
             f.createIndexedAccessTypeNode(
               f.createTypeReferenceNode(this.ids.inputInterface),
               parametricIndexNode,