Migrates to Zod v4 #7005
Draft
Migrates to Zod v4 #7005
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MartinM85
reviewed
Oct 16, 2025
Contributor
MartinM85
left a comment
MartinM85
left a comment
There was a problem hiding this comment.
Quick review. Nothing major, but maybe I overlooked something.
src/m365/entra/commands/roledefinition/roledefinition-remove.ts
Outdated
Show resolved
Hide resolved
| .strict(); | ||
| export const options = z.strictObject({ | ||
| ...globalOptionsZod.shape, | ||
| userId: z.string().refine(id => validation.isValidGuid(id), { |
Contributor
There was a problem hiding this comment.
Suggested change
| userId: z.string().refine(id => validation.isValidGuid(id), { | |
| userId: z.uuid().refine(id => validation.isValidGuid(id), { |
Member
Author
There was a problem hiding this comment.
If we're using uuid(), then we don't need to add manual refinement on top. z.uuid() would suffice.
Member
Author
|
Thanks for the feedback @MartinM85! Very keen eye! |
Co-authored-by: Martin Machacek <[email protected]>
Co-authored-by: Martin Machacek <[email protected]>
Co-authored-by: Martin Machacek <[email protected]>
Co-authored-by: Martin Machacek <[email protected]>
Co-authored-by: Martin Machacek <[email protected]>
Co-authored-by: Martin Machacek <[email protected]>
Co-authored-by: Martin Machacek <[email protected]>
waldekmastykarz
force-pushed
the
zod4
branch
from
a86f242 to
4138dd6
Compare
MartinM85
requested changes
Nov 26, 2025
Contributor
MartinM85
left a comment
MartinM85
left a comment
There was a problem hiding this comment.
Just a few minor suggestions from my side...using z.uuid() instead of z.string() in several commands.
| }), | ||
| certificateBase64Encoded: z.string().optional(), | ||
| thumbprint: z.string().optional(), | ||
| appId: z.string().optional(), |
Contributor
There was a problem hiding this comment.
Suggested change
| appId: z.string().optional(), | |
| appId: z.uuid().optional(), |
Comment on lines
+15
to
+30
| export const options = z.strictObject({ | ||
| ...globalOptionsZod.shape, | ||
| roleDefinitionId: z.string().optional(), | ||
| roleDefinitionName: z.string().optional(), | ||
| principalId: z.string().optional(), | ||
| principalName: z.string().optional(), | ||
| scope: z.enum(['tenant', 'user', 'group', 'administrativeUnit', 'custom']).alias('s'), | ||
| userId: z.string().optional(), | ||
| userName: z.string().optional(), | ||
| groupId: z.string().optional(), | ||
| groupName: z.string().optional(), | ||
| administrativeUnitId: z.string().optional(), | ||
| administrativeUnitName: z.string().optional(), | ||
| customAppScopeId: z.string().optional(), | ||
| customAppScopeName: z.string().optional() | ||
| }); |
Contributor
There was a problem hiding this comment.
Suggested change
| export const options = z.strictObject({ | |
| ...globalOptionsZod.shape, | |
| roleDefinitionId: z.string().optional(), | |
| roleDefinitionName: z.string().optional(), | |
| principalId: z.string().optional(), | |
| principalName: z.string().optional(), | |
| scope: z.enum(['tenant', 'user', 'group', 'administrativeUnit', 'custom']).alias('s'), | |
| userId: z.string().optional(), | |
| userName: z.string().optional(), | |
| groupId: z.string().optional(), | |
| groupName: z.string().optional(), | |
| administrativeUnitId: z.string().optional(), | |
| administrativeUnitName: z.string().optional(), | |
| customAppScopeId: z.string().optional(), | |
| customAppScopeName: z.string().optional() | |
| }); | |
| export const options = z.strictObject({ | |
| ...globalOptionsZod.shape, | |
| roleDefinitionId: z.uuid().optional(), | |
| roleDefinitionName: z.string().optional(), | |
| principalId: z.uuid().optional(), | |
| principalName: z.string().optional(), | |
| scope: z.enum(['tenant', 'user', 'group', 'administrativeUnit', 'custom']).alias('s'), | |
| userId: z.uuid().optional(), | |
| userName: z.string().optional(), | |
| groupId: z.uuid().optional(), | |
| groupName: z.string().optional(), | |
| administrativeUnitId: z.uuid().optional(), | |
| administrativeUnitName: z.string().optional(), | |
| customAppScopeId: z.uuid().optional(), | |
| customAppScopeName: z.string().optional() | |
| }); |
Comment on lines
+14
to
+15
| appId: z.string().optional(), | ||
| appObjectId: z.string().optional(), |
Contributor
There was a problem hiding this comment.
Suggested change
| appId: z.string().optional(), | |
| appObjectId: z.string().optional(), | |
| appId: z.uuid().optional(), | |
| appObjectId: z.uuid().optional(), |
| const options = z.looseObject({ | ||
| ...globalOptionsZod.shape, | ||
| name: z.string().alias('n'), | ||
| resourceId: z.string().alias('i'), |
Contributor
There was a problem hiding this comment.
Suggested change
| resourceId: z.string().alias('i'), | |
| resourceId: z.uuid().alias('i'), |
| .strict(); | ||
| export const options = z.strictObject({ | ||
| ...globalOptionsZod.shape, | ||
| resourceId: z.string().alias('i'), |
Contributor
There was a problem hiding this comment.
Suggested change
| resourceId: z.string().alias('i'), | |
| resourceId: z.uuid().alias('i'), |
| .strict(); | ||
| export const options = z.strictObject({ | ||
| ...globalOptionsZod.shape, | ||
| resourceId: z.string().alias('i'), |
Contributor
There was a problem hiding this comment.
Suggested change
| resourceId: z.string().alias('i'), | |
| resourceId: z.uuid().alias('i'), |
| const options = z.looseObject({ | ||
| ...globalOptionsZod.shape, | ||
| name: z.string().alias('n'), | ||
| resourceId: z.string().alias('i'), |
Contributor
There was a problem hiding this comment.
Suggested change
| resourceId: z.string().alias('i'), | |
| resourceId: z.uuid().alias('i'), |
Comment on lines
+14
to
+16
| userId: z.string().refine(id => validation.isValidGuid(id), { | ||
| error: e => `'${e.input}' is not a valid GUID.` | ||
| }).optional().alias('i'), |
Contributor
There was a problem hiding this comment.
Suggested change
| userId: z.string().refine(id => validation.isValidGuid(id), { | |
| error: e => `'${e.input}' is not a valid GUID.` | |
| }).optional().alias('i'), | |
| userId: z.uuid().optional().alias('i'), |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.