Skip to content

Fix bug with zod ordering and default/optional methods #324

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
david-crespo merged 10 commits into from
Jan 9, 2026
Merged

Fix bug with zod ordering and default/optional methods #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f38cbe2
Move default to end; no optional when default
charliepark Jan 9, 2026
fb52bbd
bump version to 0.13.1
charliepark Jan 9, 2026
51c61d2
Handle defaults in number schemas
charliepark Jan 9, 2026
e5e8bbd
npm run fmt
charliepark Jan 9, 2026
5a016d4
code review updates; using factory functions to address shared refere…
charliepark Jan 9, 2026
7acd8dc
refactor out skipDefault
charliepark Jan 9, 2026
1f58ca0
use default 0 to simplify ordering test
charliepark Jan 9, 2026
e6c7103
back out factory functions
charliepark Jan 9, 2026
56ec198
npm run fmt
charliepark Jan 9, 2026
7c9e26d
single quotes
charliepark Jan 9, 2026
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 OMICRON_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
135be59591f1ba4bc5941f63bf3a08a0b187b1a9
e81e2a717bce26bd6c89814b51d0b953c5f440f0
4 changes: 2 additions & 2 deletions oxide-openapi-gen-ts/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion oxide-openapi-gen-ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oxide/openapi-gen-ts",
"version": "0.13.0",
"version": "0.13.1",
"description": "OpenAPI client generator used to generate Oxide TypeScript SDK",
"keywords": [
"oxide",
Expand Down
74 changes: 37 additions & 37 deletions oxide-openapi-gen-ts/src/__snapshots__/validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export const PoolSelector = z.preprocess(processResponseBody,z.union([
z.object({"pool": NameOrId,
"type": z.enum(["explicit"]),
}),
z.object({"ipVersion": IpVersion.nullable().default(null).optional(),
z.object({"ipVersion": IpVersion.nullable().default(null),
"type": z.enum(["auto"]),
}),
])
Expand All @@ -159,7 +159,7 @@ z.object({"ip": z.ipv4(),
"pool": NameOrId.nullable().optional(),
"type": z.enum(["explicit"]),
}),
z.object({"poolSelector": PoolSelector.default({"ipVersion":null,"type":"auto"}).optional(),
z.object({"poolSelector": PoolSelector.default({"ipVersion":null,"type":"auto"}),
"type": z.enum(["auto"]),
}),
])
Expand Down Expand Up @@ -1556,7 +1556,7 @@ export const Distributionint64 = z.preprocess(processResponseBody,z.object({"bin
/**
* Parameters for creating an ephemeral IP address for an instance.
*/
export const EphemeralIpCreate = z.preprocess(processResponseBody,z.object({"poolSelector": PoolSelector.default({"ipVersion":null,"type":"auto"}).optional(),
export const EphemeralIpCreate = z.preprocess(processResponseBody,z.object({"poolSelector": PoolSelector.default({"ipVersion":null,"type":"auto"}),
}))

/**
Expand Down Expand Up @@ -1596,7 +1596,7 @@ z.object({"description": z.string(),
* Parameters for creating an external IP address for instances.
*/
export const ExternalIpCreate = z.preprocess(processResponseBody,z.union([
z.object({"poolSelector": PoolSelector.default({"ipVersion":null,"type":"auto"}).optional(),
z.object({"poolSelector": PoolSelector.default({"ipVersion":null,"type":"auto"}),
"type": z.enum(["ephemeral"]),
}),
z.object({"floatingIp": NameOrId,
Expand Down Expand Up @@ -1734,7 +1734,7 @@ export const FloatingIpAttach = z.preprocess(processResponseBody,z.object({"kind
/**
* Parameters for creating a new floating IP address for instances.
*/
export const FloatingIpCreate = z.preprocess(processResponseBody,z.object({"addressSelector": AddressSelector.default({"poolSelector":{"ipVersion":null,"type":"auto"},"type":"auto"}).optional(),
export const FloatingIpCreate = z.preprocess(processResponseBody,z.object({"addressSelector": AddressSelector.default({"poolSelector":{"ipVersion":null,"type":"auto"},"type":"auto"}),
"description": z.string(),
"name": Name,
}))
Expand Down Expand Up @@ -1942,7 +1942,7 @@ z.object({"type": z.enum(["explicit"]),
* Configuration for a network interface's IPv4 addressing.
*/
export const PrivateIpv4StackCreate = z.preprocess(processResponseBody,z.object({"ip": Ipv4Assignment,
"transitIps": Ipv4Net.array().default([]).optional(),
"transitIps": Ipv4Net.array().default([]),
}))

/**
Expand All @@ -1961,7 +1961,7 @@ z.object({"type": z.enum(["explicit"]),
* Configuration for a network interface's IPv6 addressing.
*/
export const PrivateIpv6StackCreate = z.preprocess(processResponseBody,z.object({"ip": Ipv6Assignment,
"transitIps": Ipv6Net.array().default([]).optional(),
"transitIps": Ipv6Net.array().default([]),
}))

/**
Expand All @@ -1986,7 +1986,7 @@ z.object({"type": z.enum(["dual_stack"]),
* Create-time parameters for an `InstanceNetworkInterface`
*/
export const InstanceNetworkInterfaceCreate = z.preprocess(processResponseBody,z.object({"description": z.string(),
"ipConfig": PrivateIpStackCreate.default({"type":"dual_stack","value":{"v4":{"ip":{"type":"auto"},"transitIps":[]},"v6":{"ip":{"type":"auto"},"transitIps":[]}}}).optional(),
"ipConfig": PrivateIpStackCreate.default({"type":"dual_stack","value":{"v4":{"ip":{"type":"auto"},"transitIps":[]},"v6":{"ip":{"type":"auto"},"transitIps":[]}}}),
"name": Name,
"subnetName": Name,
"vpcName": Name,
Expand All @@ -2013,22 +2013,22 @@ z.object({"type": z.enum(["none"]),
/**
* Create-time parameters for an `Instance`
*/
export const InstanceCreate = z.preprocess(processResponseBody,z.object({"antiAffinityGroups": NameOrId.array().default([]).optional(),
"autoRestartPolicy": InstanceAutoRestartPolicy.nullable().default(null).optional(),
"bootDisk": InstanceDiskAttachment.nullable().default(null).optional(),
"cpuPlatform": InstanceCpuPlatform.nullable().default(null).optional(),
export const InstanceCreate = z.preprocess(processResponseBody,z.object({"antiAffinityGroups": NameOrId.array().default([]),
"autoRestartPolicy": InstanceAutoRestartPolicy.nullable().default(null),
"bootDisk": InstanceDiskAttachment.nullable().default(null),
"cpuPlatform": InstanceCpuPlatform.nullable().default(null),
"description": z.string(),
"disks": InstanceDiskAttachment.array().default([]).optional(),
"externalIps": ExternalIpCreate.array().default([]).optional(),
"disks": InstanceDiskAttachment.array().default([]),
"externalIps": ExternalIpCreate.array().default([]),
"hostname": Hostname,
"memory": ByteCount,
"multicastGroups": NameOrId.array().default([]).optional(),
"multicastGroups": NameOrId.array().default([]),
"name": Name,
"ncpus": InstanceCpuCount,
"networkInterfaces": InstanceNetworkInterfaceAttachment.default({"type":"default_dual_stack"}).optional(),
"networkInterfaces": InstanceNetworkInterfaceAttachment.default({"type":"default_dual_stack"}),
"sshPublicKeys": NameOrId.array().nullable().optional(),
"start": SafeBoolean.default(true).optional(),
"userData": z.string().default("").optional(),
"start": SafeBoolean.default(true),
"userData": z.string().default(""),
}))

/**
Expand Down Expand Up @@ -2100,8 +2100,8 @@ export const InstanceNetworkInterfaceResultsPage = z.preprocess(processResponseB
*/
export const InstanceNetworkInterfaceUpdate = z.preprocess(processResponseBody,z.object({"description": z.string().nullable().optional(),
"name": Name.nullable().optional(),
"primary": SafeBoolean.default(false).optional(),
"transitIps": IpNet.array().default([]).optional(),
"primary": SafeBoolean.default(false),
"transitIps": IpNet.array().default([]),
}))

/**
Expand All @@ -2125,7 +2125,7 @@ export const InstanceUpdate = z.preprocess(processResponseBody,z.object({"autoRe
"bootDisk": NameOrId.nullable(),
"cpuPlatform": InstanceCpuPlatform.nullable(),
"memory": ByteCount,
"multicastGroups": NameOrId.array().nullable().default(null).optional(),
"multicastGroups": NameOrId.array().nullable().default(null),
"ncpus": InstanceCpuCount,
}))

Expand Down Expand Up @@ -2244,9 +2244,9 @@ export const IpPool = z.preprocess(processResponseBody,z.object({"description":
* ASM: IPv4 addresses outside 232.0.0.0/8, IPv6 addresses with flag field != 3 SSM: IPv4 addresses in 232.0.0.0/8, IPv6 addresses with flag field = 3
*/
export const IpPoolCreate = z.preprocess(processResponseBody,z.object({"description": z.string(),
"ipVersion": IpVersion.default("v4").optional(),
"ipVersion": IpVersion.default("v4"),
"name": Name,
"poolType": IpPoolType.default("unicast").optional(),
"poolType": IpPoolType.default("unicast"),
}))

export const IpPoolLinkSilo = z.preprocess(processResponseBody,z.object({"isDefault": SafeBoolean,
Expand Down Expand Up @@ -2498,11 +2498,11 @@ export const MulticastGroup = z.preprocess(processResponseBody,z.object({"descri
* Create-time parameters for a multicast group.
*/
export const MulticastGroupCreate = z.preprocess(processResponseBody,z.object({"description": z.string(),
"multicastIp": z.ipv4().nullable().default(null).optional(),
"mvlan": z.number().default(null).min(0).max(65535).nullable().optional(),
"multicastIp": z.ipv4().nullable().default(null),
"mvlan": z.number().min(0).max(65535).nullable().default(null),
"name": Name,
"pool": NameOrId.nullable().default(null).optional(),
"sourceIps": z.ipv4().array().nullable().default(null).optional(),
"pool": NameOrId.nullable().default(null),
"sourceIps": z.ipv4().array().nullable().default(null),
}))

/**
Expand Down Expand Up @@ -2552,7 +2552,7 @@ export const MulticastGroupUpdate = z.preprocess(processResponseBody,z.object({"
*/
export const PrivateIpv4Config = z.preprocess(processResponseBody,z.object({"ip": z.ipv4(),
"subnet": Ipv4Net,
"transitIps": Ipv4Net.array().default([]).optional(),
"transitIps": Ipv4Net.array().default([]),
}))

/**
Expand Down Expand Up @@ -2755,7 +2755,7 @@ export const Probe = z.preprocess(processResponseBody,z.object({"description": z
*/
export const ProbeCreate = z.preprocess(processResponseBody,z.object({"description": z.string(),
"name": Name,
"poolSelector": PoolSelector.default({"ipVersion":null,"type":"auto"}).optional(),
"poolSelector": PoolSelector.default({"ipVersion":null,"type":"auto"}),
"sled": z.uuid(),
}))

Expand Down Expand Up @@ -2981,7 +2981,7 @@ export const SamlIdentityProviderCreate = z.preprocess(processResponseBody,z.obj
"idpEntityId": z.string(),
"idpMetadataSource": IdpMetadataSource,
"name": Name,
"signingKeypair": DerEncodedKeyPair.nullable().default(null).optional(),
"signingKeypair": DerEncodedKeyPair.nullable().default(null),
"sloUrl": z.string(),
"spClientId": z.string(),
"technicalContactEmail": z.string(),
Expand Down Expand Up @@ -3063,7 +3063,7 @@ export const SiloCreate = z.preprocess(processResponseBody,z.object({"adminGroup
"description": z.string(),
"discoverable": SafeBoolean,
"identityMode": SiloIdentityMode,
"mappedFleetRoles": z.record(z.string(),FleetRole.array().refine(...uniqueItems)).optional(),
"mappedFleetRoles": z.record(z.string(),FleetRole.array().refine(...uniqueItems)),
"name": Name,
"quotas": SiloQuotasCreate,
"tlsCertificates": CertificateCreate.array(),
Expand Down Expand Up @@ -3515,14 +3515,14 @@ export const SwitchPortSettings = z.preprocess(processResponseBody,z.object({"ad
* Parameters for creating switch port settings. Switch port settings are the central data structure for setting up external networking. Switch port settings include link, interface, route, address and dynamic network protocol configuration.
*/
export const SwitchPortSettingsCreate = z.preprocess(processResponseBody,z.object({"addresses": AddressConfig.array(),
"bgpPeers": BgpPeerConfig.array().default([]).optional(),
"bgpPeers": BgpPeerConfig.array().default([]),
"description": z.string(),
"groups": NameOrId.array().default([]).optional(),
"interfaces": SwitchInterfaceConfigCreate.array().default([]).optional(),
"groups": NameOrId.array().default([]),
"interfaces": SwitchInterfaceConfigCreate.array().default([]),
"links": LinkConfigCreate.array(),
"name": Name,
"portConfig": SwitchPortConfigCreate,
"routes": RouteConfig.array().default([]).optional(),
"routes": RouteConfig.array().default([]),
}))

/**
Expand Down Expand Up @@ -3883,7 +3883,7 @@ export const VpcFirewallRuleUpdate = z.preprocess(processResponseBody,z.object({
/**
* Updated list of firewall rules. Will replace all existing rules.
*/
export const VpcFirewallRuleUpdateParams = z.preprocess(processResponseBody,z.object({"rules": VpcFirewallRuleUpdate.array().default([]).optional(),
export const VpcFirewallRuleUpdateParams = z.preprocess(processResponseBody,z.object({"rules": VpcFirewallRuleUpdate.array().default([]),
}))

/**
Expand Down Expand Up @@ -3988,7 +3988,7 @@ export const WebhookCreate = z.preprocess(processResponseBody,z.object({"descrip
"endpoint": z.string(),
"name": Name,
"secrets": z.string().array(),
"subscriptions": AlertSubscription.array().default([]).optional(),
"subscriptions": AlertSubscription.array().default([]),
}))

/**
Expand Down
Loading
Loading