Skip to content

Fix serializeRecord to handle null/undefined additionalProperties #3575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
v-jiaodi merged 4 commits into from
Nov 4, 2025
Merged

Fix serializeRecord to handle null/undefined additionalProperties #3575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70f9735
Initial plan
Copilot Nov 4, 2025
79b4d0b
Fix serializeRecord to handle null and undefined for additional prope…
Copilot Nov 4, 2025
cf9fc76
Regenerate smoke test files with serializeRecord fix
Copilot Nov 4, 2025
7c25177
Merge branch 'main' into copilot/fix-serialize-record-null-support
v-jiaodi Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../test/healthInsights_radiologyinsights/generated/typespec-ts/src/models/fhir/r4/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export interface Resource {

export function resourceSerializer(item: Resource): any {
return {
...serializeRecord(item.additionalProperties),
...serializeRecord(item.additionalProperties ?? {}),
resourceType: item["resourceType"],
id: item["id"],
meta: !item["meta"] ? item["meta"] : metaSerializer(item["meta"]),
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/openai_generic/generated/typespec-ts/src/models/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1745,7 +1745,7 @@ export interface ChatCompletionFunctionParameters {
export function chatCompletionFunctionParametersSerializer(
item: ChatCompletionFunctionParameters,
): any {
return { ...serializeRecord(item.additionalProperties) };
return { ...serializeRecord(item.additionalProperties ?? {}) };
}

/** Alias for _CreateChatCompletionRequestFunctionCall */
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/test/openai_non_branded/generated/typespec-ts/src/models/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1744,7 +1744,7 @@ export interface ChatCompletionFunctionParameters {
export function chatCompletionFunctionParametersSerializer(
item: ChatCompletionFunctionParameters,
): any {
return { ...serializeRecord(item.additionalProperties) };
return { ...serializeRecord(item.additionalProperties ?? {}) };
}

/** Alias for _CreateChatCompletionRequestFunctionCall */
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-ts/src/modular/serialization/buildSerializerFunction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ function getAdditionalPropertiesStatement(
false,
true
);
const params = [`item.${getAdditionalPropertiesName(context, type)}`];
const params = [`item.${getAdditionalPropertiesName(context, type)} ?? {}`];
if (typeof deserializerFunction === "string") {
params.push("undefined");
params.push(deserializerFunction);
Expand Down
14 changes: 7 additions & 7 deletions ...spec-ts/test/modularUnit/scenarios/models/serialization/additionalProperties.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export interface SimpleModel {

export function simpleModelSerializer(item: SimpleModel): any {
return {
...serializeRecord(item.additionalProperties),
...serializeRecord(item.additionalProperties ?? {}),
propA: item["propA"],
propB: item["propB"],
};
Expand All @@ -178,7 +178,7 @@ export interface ComplexModel {
export function complexModelSerializer(item: ComplexModel): any {
return {
...serializeRecord(
item.additionalProperties,
item.additionalProperties ?? {},
undefined,
simpleModelSerializer,
),
Expand Down Expand Up @@ -233,7 +233,7 @@ export interface SimpleModel {
}

export function simpleModelSerializer(item: SimpleModel): any {
return { ...serializeRecord(item.additionalProperties) };
return { ...serializeRecord(item.additionalProperties ?? {}) };
}

/** model interface ComplexModel */
Expand All @@ -245,7 +245,7 @@ export interface ComplexModel extends SimpleModel {
export function complexModelSerializer(item: ComplexModel): any {
return {
...serializeRecord(
item.additionalProperties,
item.additionalProperties ?? {},
undefined,
simpleModelSerializer
)
Expand Down Expand Up @@ -298,7 +298,7 @@ export interface SimpleModel {
export function simpleModelSerializer(item: SimpleModel): any {
return {
...serializeRecord(
item.additionalProperties,
item.additionalProperties ?? {},
undefined,
_simpleModelAdditionalPropertySerializer,
),
Expand Down Expand Up @@ -375,7 +375,7 @@ export interface SimpleModel {

export function simpleModelSerializer(item: SimpleModel): any {
return {
...serializeRecord(item.additionalPropertiesBag),
...serializeRecord(item.additionalPropertiesBag ?? {}),
additionalProperties: item["additionalProperties"],
propA: item["propA"],
propB: item["propB"],
Expand All @@ -392,7 +392,7 @@ export interface FooModel extends BarModel {

export function fooModelSerializer(item: FooModel): any {
return {
...serializeRecord(item.additionalPropertiesBag),
...serializeRecord(item.additionalPropertiesBag ?? {}),
additionalProperties: item["additionalProperties"],
propA: item["propA"],
propB: item["propB"],
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-ts/test/modularUnit/scenarios/modelsGenerator/modelsGenerator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2546,7 +2546,7 @@ export interface Vegetables {
export function vegetablesSerializer(item: Vegetables): any {
return {
...serializeRecord(
item.additionalProperties,
item.additionalProperties ?? {},
undefined,
_vegetablesAdditionalPropertySerializer,
),
Expand Down
Loading
⚡