fix(cli): correctly support AdditionalProperties during object parsin…

…g. (#5457) * correctly support AdditionalProperties; add eyw520 as api-importer codeowner. * Update snapshots
fern-api · Dec 20, 2024 · be0e322 · be0e322
1 parent d03d053
commit be0e322
Show file tree

Hide file tree

Showing 58 changed files with 368 additions and 1,434 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -22,5 +22,6 @@ generators/openapi/* @dsinghvi
 
 # Specific rules for packages
 packages/cli/* @amckinney
+packages/cli/api-importers/* @eyw520
 packages/generators/cli/* @dsinghvi
 packages/generators/docker/* @dsinghvi
diff --git a/packages/cli/cli/versions.yml b/packages/cli/cli/versions.yml
@@ -1,3 +1,10 @@
+- changelogEntry:
+    - summary: |
+        Correctly support AdditionalProperties on object schemas.
+      type: fix
+  irVersion: 53
+  version: 0.46.10
+
 - changelogEntry:
     - summary: |
         SDK generation no longer hard-fails on single example generation errors.

diff --git a/packages/cli/ete-tests/src/tests/fdr/__snapshots__/fdr.test.ts.snap b/packages/cli/ete-tests/src/tests/fdr/__snapshots__/fdr.test.ts.snap
@@ -74,10 +74,7 @@ exports[`fdr > {"name":"changelog"} 1`] = `
                             "value": "type_director:Age"
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         },
         "type_director:Age": {
@@ -172,10 +169,7 @@ exports[`fdr > {"name":"changelog"} 1`] = `
                             }
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         },
         "type_imdb:CreateMovieRequest": {
@@ -205,10 +199,7 @@ exports[`fdr > {"name":"changelog"} 1`] = `
                             }
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         },
         "type_imdb:DirectorWrapper": {
@@ -224,21 +215,15 @@ exports[`fdr > {"name":"changelog"} 1`] = `
                             "value": "type_director:Director"
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         },
         "type_imdb:EmptyObject": {
             "name": "EmptyObject",
             "shape": {
                 "type": "object",
                 "extends": [],
-                "properties": [],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                "properties": []
             }
         },
         "type_imdb:Person": {
@@ -311,10 +296,7 @@ exports[`fdr > {"name":"changelog"} 1`] = `
                             }
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         }
     },
@@ -921,10 +903,7 @@ exports[`fdr > {"name":"simple"} 1`] = `
                             "value": "type_director:Age"
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         },
         "type_director:Age": {
@@ -1019,10 +998,7 @@ exports[`fdr > {"name":"simple"} 1`] = `
                             }
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         },
         "type_imdb:CreateMovieRequest": {
@@ -1052,10 +1028,7 @@ exports[`fdr > {"name":"simple"} 1`] = `
                             }
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         },
         "type_imdb:DirectorWrapper": {
@@ -1071,21 +1044,15 @@ exports[`fdr > {"name":"simple"} 1`] = `
                             "value": "type_director:Director"
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         },
         "type_imdb:EmptyObject": {
             "name": "EmptyObject",
             "shape": {
                 "type": "object",
                 "extends": [],
-                "properties": [],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                "properties": []
             }
         },
         "type_imdb:Person": {
@@ -1158,10 +1125,7 @@ exports[`fdr > {"name":"simple"} 1`] = `
                             }
                         }
                     }
-                ],
-                "extraProperties": {
-                    "type": "unknown"
-                }
+                ]
             }
         }
     },

diff --git a/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/alias-extends.json b/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/alias-extends.json
@@ -25,10 +25,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_:Child": {
@@ -48,10 +45,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     }
   },

diff --git a/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/alias.json b/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/alias.json
@@ -36,10 +36,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_:Object": {

diff --git a/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/any-auth.json b/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/any-auth.json
@@ -37,10 +37,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_user:User": {
@@ -67,10 +64,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     }
   },

diff --git a/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/audiences.json b/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/audiences.json
@@ -28,10 +28,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_folder-b/common:Foo": {
@@ -50,10 +47,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_folder-c/common:FolderCFoo": {
@@ -71,10 +65,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_folder-d/service:Response": {
@@ -92,10 +83,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_foo:ImportingType": {
@@ -111,10 +99,7 @@
               "value": "type_commons:Imported"
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_foo:OptionalString": {
@@ -159,10 +144,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     }
   },

diff --git a/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/availability.json b/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/availability.json
@@ -16,10 +16,7 @@
             },
             "availability": "Beta"
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     }
   },

diff --git a/...ster/src/ir-to-fdr-converter/__test__/__snapshots__/basic-auth-environment-variables.json b/...ster/src/ir-to-fdr-converter/__test__/__snapshots__/basic-auth-environment-variables.json
@@ -15,10 +15,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     }
   },

diff --git a/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/basic-auth.json b/packages/cli/register/src/ir-to-fdr-converter/__test__/__snapshots__/basic-auth.json
@@ -15,10 +15,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     }
   },

diff --git a/...register/src/ir-to-fdr-converter/__test__/__snapshots__/circular-references-advanced.json b/...register/src/ir-to-fdr-converter/__test__/__snapshots__/circular-references-advanced.json
@@ -16,10 +16,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_:RootType": {
@@ -37,10 +34,7 @@
               }
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     },
     "type_a:A": {
@@ -50,10 +44,7 @@
         "extends": [
           "type_:RootType"
         ],
-        "properties": [],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        "properties": []
       }
     },
     "type_ast:ContainerValue": {
@@ -120,10 +111,7 @@
       "shape": {
         "type": "object",
         "extends": [],
-        "properties": [],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        "properties": []
       }
     },
     "type_ast:FieldName": {
@@ -207,10 +195,7 @@
               "value": "type_ast:FieldValue"
             }
           }
-        ],
-        "extraProperties": {
-          "type": "unknown"
-        }
+        ]
       }
     }
   },
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,10 +36,7 @@ @@
                   }
                 }
               }
-            ],
-            "extraProperties": {
-              "type": "unknown"
-            }
+            ]
           }
         },
         "type_:Object": {
@@ Expand Down @@