fix(enum-values): access optional prop child props

openapi-ts · Feb 5, 2025 · b11ceea · b11ceea
1 parent 82e98b4
commit b11ceea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/openapi-typescript/src/lib/ts.ts b/packages/openapi-typescript/src/lib/ts.ts
@@ -116,13 +116,13 @@ export function addJSDocComment(schemaObject: AnnotatedSchemaObject, node: ts.Pr
 }
 
 /** Convert OpenAPI ref into TS indexed access node (ex: `components["schemas"]["Foo"]`) */
-export function oapiRef(path: string): ts.TypeNode {
+export function oapiRef(path: string, deepRequired = false): ts.TypeNode {
   const { pointer } = parseRef(path);
   if (pointer.length === 0) {
     throw new Error(`Error parsing $ref: ${path}. Is this a valid $ref?`);
   }
   let t: ts.TypeReferenceNode | ts.IndexedAccessTypeNode = ts.factory.createTypeReferenceNode(
-    ts.factory.createIdentifier(String(pointer[0])),
+    ts.factory.createIdentifier(deepRequired ? `DeepRequired<${String(pointer[0])}>` : String(pointer[0])),
   );
   if (pointer.length > 1) {
     for (let i = 1; i < pointer.length; i++) {
@@ -251,6 +251,16 @@ export function tsArrayLiteralExpression(
   let variableName = sanitizeMemberName(name);
   variableName = `${variableName[0].toLowerCase()}${variableName.substring(1)}`;
 
+  if (
+    options?.injectFooter &&
+    !options.injectFooter.some((node) => ts.isTypeAliasDeclaration(node) && node?.name?.escapedText === "DeepRequired")
+  ) {
+    const helper = stringToAST(
+      "type DeepRequired<T> = { [K in keyof T]: Required<DeepRequired<T[K]>> };",
+    )[0] as any;
+    options.injectFooter.push(helper);
+  }
+
   const arrayType = options?.readonly
     ? tsReadonlyArray(elementType, options.injectFooter)
     : ts.factory.createArrayTypeNode(elementType);

diff --git a/packages/openapi-typescript/src/transform/schema-object.ts b/packages/openapi-typescript/src/transform/schema-object.ts
@@ -148,7 +148,7 @@ export function transformSchemaObjectWithComposition(
 
       const enumValuesArray = tsArrayLiteralExpression(
         enumValuesVariableName,
-        oapiRef(options.path ?? ""),
+        oapiRef(options.path ?? "", true),
         schemaObject.enum as (string | number)[],
         {
           export: true,