@f3liz/rescript-misskey-api 0.6.4 → 0.6.6

package/lib/es6/src/generated/misskey-io/api/MisskeyIoAccount.mjs

@@ -28,9 +28,9 @@ function postBlockingDelete(body, fetch) {
 }
 
 let postBlockingListRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postBlockingListResponseSchema = S.array(MisskeyIoComponentSchemas.Blocking.schema);
@@ -58,9 +58,9 @@ function postClipsMyFavorites(fetch) {
 
 let postClipsNotesRequestSchema = S.object(s => ({
   clipId: s.f("clipId", S.string),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postClipsNotesResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -81,9 +81,9 @@ function postClipsRemoveNote(body, fetch) {
 }
 
 let postFlashMyRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postFlashMyResponseSchema = S.array(MisskeyIoComponentSchemas.Flash.schema);
@@ -94,9 +94,9 @@ function postFlashMy(body, fetch) {
 }
 
 let postFlashMyLikesRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postFlashMyLikesResponse_1Schema = S.object(s => ({
@@ -118,9 +118,9 @@ function postI(fetch) {
 }
 
 let postIFavoritesRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postIFavoritesResponseSchema = S.array(MisskeyIoComponentSchemas.NoteFavorite.schema);
@@ -131,9 +131,9 @@ function postIFavorites(body, fetch) {
 }
 
 let postIGalleryLikesRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postIGalleryLikesResponse_1Schema = S.object(s => ({
@@ -149,9 +149,9 @@ function postIGalleryLikes(body, fetch) {
 }
 
 let postIGalleryPostsRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postIGalleryPostsResponseSchema = S.array(MisskeyIoComponentSchemas.GalleryPost.schema);
@@ -162,12 +162,12 @@ function postIGalleryPosts(body, fetch) {
 }
 
 let postINotificationsRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  markAsRead: s.fieldOr("markAsRead", S.nullableAsOption(S.bool), undefined),
-  includeTypes: s.fieldOr("includeTypes", S.nullableAsOption(S.array(S.string)), undefined),
-  excludeTypes: s.fieldOr("excludeTypes", S.nullableAsOption(S.array(S.string)), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  markAsRead: s.f("markAsRead", S.option(S.bool)),
+  includeTypes: s.f("includeTypes", S.option(S.array(S.string))),
+  excludeTypes: s.f("excludeTypes", S.option(S.array(S.string)))
 }));
 
 let postINotificationsResponseSchema = S.array(MisskeyIoComponentSchemas.Notification.schema);
@@ -178,12 +178,12 @@ function postINotifications(body, fetch) {
 }
 
 let postINotificationsGroupedRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  markAsRead: s.fieldOr("markAsRead", S.nullableAsOption(S.bool), undefined),
-  includeTypes: s.fieldOr("includeTypes", S.nullableAsOption(S.array(S.string)), undefined),
-  excludeTypes: s.fieldOr("excludeTypes", S.nullableAsOption(S.array(S.string)), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  markAsRead: s.f("markAsRead", S.option(S.bool)),
+  includeTypes: s.f("includeTypes", S.option(S.array(S.string))),
+  excludeTypes: s.f("excludeTypes", S.option(S.array(S.string)))
 }));
 
 let postINotificationsGroupedResponseSchema = S.array(MisskeyIoComponentSchemas.Notification.schema);
@@ -194,9 +194,9 @@ function postINotificationsGrouped(body, fetch) {
 }
 
 let postIPageLikesRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postIPageLikesResponse_1Schema = S.object(s => ({
@@ -212,9 +212,9 @@ function postIPageLikes(body, fetch) {
 }
 
 let postIPagesRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postIPagesResponseSchema = S.array(MisskeyIoComponentSchemas.Page.schema);
@@ -237,8 +237,8 @@ function postIPin(body, fetch) {
 
 let postIPurgeTimelineCacheRequestSchema = S.object(s => ({
   type: s.f("type", S.string),
-  listId: s.fieldOr("listId", S.nullableAsOption(S.string), undefined),
-  antennaId: s.fieldOr("antennaId", S.nullableAsOption(S.string), undefined)
+  listId: s.f("listId", S.option(S.string)),
+  antennaId: s.f("antennaId", S.option(S.string))
 }));
 
 function postIPurgeTimelineCache(body, fetch) {
@@ -269,30 +269,30 @@ function postIUnpin(body, fetch) {
 let postIUpdateRequest_5Schema = S.object(s => ({
   url: s.f("url", S.string),
   fileId: s.f("fileId", S.string),
-  description: s.fieldOr("description", S.nullableAsOption(S.string), undefined)
+  description: s.f("description", S.option(S.string))
 }));
 
 let postIUpdateRequest_4Schema = S.object(s => ({
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
+  name: s.f("name", S.option(S.string)),
   mutualLinks: s.f("mutualLinks", S.array(postIUpdateRequest_5Schema))
 }));
 
 let postIUpdateRequest_3Schema = S.object(s => ({
-  note: s.fieldOr("note", S.nullableAsOption(S.dict(S.json)), undefined),
-  follow: s.fieldOr("follow", S.nullableAsOption(S.dict(S.json)), undefined),
-  mention: s.fieldOr("mention", S.nullableAsOption(S.dict(S.json)), undefined),
-  reply: s.fieldOr("reply", S.nullableAsOption(S.dict(S.json)), undefined),
-  renote: s.fieldOr("renote", S.nullableAsOption(S.dict(S.json)), undefined),
-  quote: s.fieldOr("quote", S.nullableAsOption(S.dict(S.json)), undefined),
-  reaction: s.fieldOr("reaction", S.nullableAsOption(S.dict(S.json)), undefined),
-  pollEnded: s.fieldOr("pollEnded", S.nullableAsOption(S.dict(S.json)), undefined),
-  receiveFollowRequest: s.fieldOr("receiveFollowRequest", S.nullableAsOption(S.dict(S.json)), undefined),
-  followRequestAccepted: s.fieldOr("followRequestAccepted", S.nullableAsOption(S.dict(S.json)), undefined),
-  roleAssigned: s.fieldOr("roleAssigned", S.nullableAsOption(S.dict(S.json)), undefined),
-  chatRoomInvitationReceived: s.fieldOr("chatRoomInvitationReceived", S.nullableAsOption(S.dict(S.json)), undefined),
-  achievementEarned: s.fieldOr("achievementEarned", S.nullableAsOption(S.dict(S.json)), undefined),
-  app: s.fieldOr("app", S.nullableAsOption(S.dict(S.json)), undefined),
-  test: s.fieldOr("test", S.nullableAsOption(S.dict(S.json)), undefined)
+  note: s.f("note", S.option(S.dict(S.json))),
+  follow: s.f("follow", S.option(S.dict(S.json))),
+  mention: s.f("mention", S.option(S.dict(S.json))),
+  reply: s.f("reply", S.option(S.dict(S.json))),
+  renote: s.f("renote", S.option(S.dict(S.json))),
+  quote: s.f("quote", S.option(S.dict(S.json))),
+  reaction: s.f("reaction", S.option(S.dict(S.json))),
+  pollEnded: s.f("pollEnded", S.option(S.dict(S.json))),
+  receiveFollowRequest: s.f("receiveFollowRequest", S.option(S.dict(S.json))),
+  followRequestAccepted: s.f("followRequestAccepted", S.option(S.dict(S.json))),
+  roleAssigned: s.f("roleAssigned", S.option(S.dict(S.json))),
+  chatRoomInvitationReceived: s.f("chatRoomInvitationReceived", S.option(S.dict(S.json))),
+  achievementEarned: s.f("achievementEarned", S.option(S.dict(S.json))),
+  app: s.f("app", S.option(S.dict(S.json))),
+  test: s.f("test", S.option(S.dict(S.json)))
 }));
 
 let postIUpdateRequest_2Schema = S.object(s => ({
@@ -302,54 +302,54 @@ let postIUpdateRequest_2Schema = S.object(s => ({
 
 let postIUpdateRequest_1Schema = S.object(s => ({
   id: s.f("id", S.string),
-  angle: s.fieldOr("angle", S.nullableAsOption(S.max(S.min(S.float, 0, undefined), 0, undefined)), undefined),
-  flipH: s.fieldOr("flipH", S.nullableAsOption(S.bool), undefined),
-  offsetX: s.fieldOr("offsetX", S.nullableAsOption(S.max(S.min(S.float, 0, undefined), 0, undefined)), undefined),
-  offsetY: s.fieldOr("offsetY", S.nullableAsOption(S.max(S.min(S.float, 0, undefined), 0, undefined)), undefined)
+  angle: s.f("angle", S.option(S.max(S.min(S.float, 0, undefined), 0, undefined))),
+  flipH: s.f("flipH", S.option(S.bool)),
+  offsetX: s.f("offsetX", S.option(S.max(S.min(S.float, 0, undefined), 0, undefined))),
+  offsetY: s.f("offsetY", S.option(S.max(S.min(S.float, 0, undefined), 0, undefined)))
 }));
 
 let postIUpdateRequestSchema = S.object(s => ({
-  name: s.fieldOr("name", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 50, undefined)), undefined),
-  description: s.fieldOr("description", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 1500, undefined)), undefined),
-  followedMessage: s.fieldOr("followedMessage", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 256, undefined)), undefined),
-  location: s.fieldOr("location", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 50, undefined)), undefined),
-  birthday: s.fieldOr("birthday", S.nullableAsOption(S.pattern(S.string, /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/, undefined)), undefined),
-  lang: s.fieldOr("lang", S.nullableAsOption(S.string), undefined),
-  postingLang: s.fieldOr("postingLang", S.nullableAsOption(S.string), undefined),
-  viewingLangs: s.fieldOr("viewingLangs", S.nullableAsOption(S.array(S.string)), undefined),
-  showMediaInAllLanguages: s.fieldOr("showMediaInAllLanguages", S.nullableAsOption(S.bool), undefined),
-  showHashtagsInAllLanguages: s.fieldOr("showHashtagsInAllLanguages", S.nullableAsOption(S.bool), undefined),
-  avatarId: s.fieldOr("avatarId", S.nullableAsOption(S.string), undefined),
-  avatarDecorations: s.fieldOr("avatarDecorations", S.nullableAsOption(S.array(postIUpdateRequest_1Schema)), undefined),
-  bannerId: s.fieldOr("bannerId", S.nullableAsOption(S.string), undefined),
-  fields: s.fieldOr("fields", S.nullableAsOption(S.array(postIUpdateRequest_2Schema)), undefined),
-  isLocked: s.fieldOr("isLocked", S.nullableAsOption(S.bool), undefined),
-  isExplorable: s.fieldOr("isExplorable", S.nullableAsOption(S.bool), undefined),
-  hideOnlineStatus: s.fieldOr("hideOnlineStatus", S.nullableAsOption(S.bool), undefined),
-  publicReactions: s.fieldOr("publicReactions", S.nullableAsOption(S.bool), undefined),
-  carefulBot: s.fieldOr("carefulBot", S.nullableAsOption(S.bool), undefined),
-  autoAcceptFollowed: s.fieldOr("autoAcceptFollowed", S.nullableAsOption(S.bool), undefined),
-  noCrawle: s.fieldOr("noCrawle", S.nullableAsOption(S.bool), undefined),
-  preventAiLearning: s.fieldOr("preventAiLearning", S.nullableAsOption(S.bool), undefined),
-  requireSigninToViewContents: s.fieldOr("requireSigninToViewContents", S.nullableAsOption(S.bool), undefined),
-  makeNotesFollowersOnlyBefore: s.fieldOr("makeNotesFollowersOnlyBefore", S.nullableAsOption(S.int), undefined),
-  makeNotesHiddenBefore: s.fieldOr("makeNotesHiddenBefore", S.nullableAsOption(S.int), undefined),
-  isBot: s.fieldOr("isBot", S.nullableAsOption(S.bool), undefined),
-  isCat: s.fieldOr("isCat", S.nullableAsOption(S.bool), undefined),
-  injectFeaturedNote: s.fieldOr("injectFeaturedNote", S.nullableAsOption(S.bool), undefined),
-  receiveAnnouncementEmail: s.fieldOr("receiveAnnouncementEmail", S.nullableAsOption(S.bool), undefined),
-  alwaysMarkNsfw: s.fieldOr("alwaysMarkNsfw", S.nullableAsOption(S.bool), undefined),
-  autoSensitive: s.fieldOr("autoSensitive", S.nullableAsOption(S.bool), undefined),
-  followingVisibility: s.fieldOr("followingVisibility", S.nullableAsOption(S.string), undefined),
-  followersVisibility: s.fieldOr("followersVisibility", S.nullableAsOption(S.string), undefined),
-  chatScope: s.fieldOr("chatScope", S.nullableAsOption(S.string), undefined),
-  pinnedPageId: s.fieldOr("pinnedPageId", S.nullableAsOption(S.string), undefined),
-  mutedWords: s.fieldOr("mutedWords", S.nullableAsOption(S.array(S.array(S.string))), undefined),
-  mutedInstances: s.fieldOr("mutedInstances", S.nullableAsOption(S.array(S.string)), undefined),
-  notificationRecieveConfig: s.fieldOr("notificationRecieveConfig", S.nullableAsOption(postIUpdateRequest_3Schema), undefined),
-  emailNotificationTypes: s.fieldOr("emailNotificationTypes", S.nullableAsOption(S.array(S.string)), undefined),
-  alsoKnownAs: s.fieldOr("alsoKnownAs", S.nullableAsOption(S.array(S.string)), undefined),
-  mutualLinkSections: s.fieldOr("mutualLinkSections", S.nullableAsOption(S.array(postIUpdateRequest_4Schema)), undefined)
+  name: s.f("name", S.option(S.max(S.min(S.string, 1, undefined), 50, undefined))),
+  description: s.f("description", S.option(S.max(S.min(S.string, 1, undefined), 1500, undefined))),
+  followedMessage: s.f("followedMessage", S.option(S.max(S.min(S.string, 1, undefined), 256, undefined))),
+  location: s.f("location", S.option(S.max(S.min(S.string, 1, undefined), 50, undefined))),
+  birthday: s.f("birthday", S.option(S.pattern(S.string, /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/, undefined))),
+  lang: s.f("lang", S.option(S.string)),
+  postingLang: s.f("postingLang", S.option(S.string)),
+  viewingLangs: s.f("viewingLangs", S.option(S.array(S.string))),
+  showMediaInAllLanguages: s.f("showMediaInAllLanguages", S.option(S.bool)),
+  showHashtagsInAllLanguages: s.f("showHashtagsInAllLanguages", S.option(S.bool)),
+  avatarId: s.f("avatarId", S.option(S.string)),
+  avatarDecorations: s.f("avatarDecorations", S.option(S.array(postIUpdateRequest_1Schema))),
+  bannerId: s.f("bannerId", S.option(S.string)),
+  fields: s.f("fields", S.option(S.array(postIUpdateRequest_2Schema))),
+  isLocked: s.f("isLocked", S.option(S.bool)),
+  isExplorable: s.f("isExplorable", S.option(S.bool)),
+  hideOnlineStatus: s.f("hideOnlineStatus", S.option(S.bool)),
+  publicReactions: s.f("publicReactions", S.option(S.bool)),
+  carefulBot: s.f("carefulBot", S.option(S.bool)),
+  autoAcceptFollowed: s.f("autoAcceptFollowed", S.option(S.bool)),
+  noCrawle: s.f("noCrawle", S.option(S.bool)),
+  preventAiLearning: s.f("preventAiLearning", S.option(S.bool)),
+  requireSigninToViewContents: s.f("requireSigninToViewContents", S.option(S.bool)),
+  makeNotesFollowersOnlyBefore: s.f("makeNotesFollowersOnlyBefore", S.option(S.int)),
+  makeNotesHiddenBefore: s.f("makeNotesHiddenBefore", S.option(S.int)),
+  isBot: s.f("isBot", S.option(S.bool)),
+  isCat: s.f("isCat", S.option(S.bool)),
+  injectFeaturedNote: s.f("injectFeaturedNote", S.option(S.bool)),
+  receiveAnnouncementEmail: s.f("receiveAnnouncementEmail", S.option(S.bool)),
+  alwaysMarkNsfw: s.f("alwaysMarkNsfw", S.option(S.bool)),
+  autoSensitive: s.f("autoSensitive", S.option(S.bool)),
+  followingVisibility: s.f("followingVisibility", S.option(S.string)),
+  followersVisibility: s.f("followersVisibility", S.option(S.string)),
+  chatScope: s.f("chatScope", S.option(S.string)),
+  pinnedPageId: s.f("pinnedPageId", S.option(S.string)),
+  mutedWords: s.f("mutedWords", S.option(S.array(S.array(S.string)))),
+  mutedInstances: s.f("mutedInstances", S.option(S.array(S.string))),
+  notificationRecieveConfig: s.f("notificationRecieveConfig", S.option(postIUpdateRequest_3Schema)),
+  emailNotificationTypes: s.f("emailNotificationTypes", S.option(S.array(S.string))),
+  alsoKnownAs: s.f("alsoKnownAs", S.option(S.array(S.string))),
+  mutualLinkSections: s.f("mutualLinkSections", S.option(S.array(postIUpdateRequest_4Schema)))
 }));
 
 let postIUpdateResponseSchema = MisskeyIoComponentSchemas.MeDetailed.schema;
@@ -361,7 +361,7 @@ function postIUpdate(body, fetch) {
 
 let postMuteCreateRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  expiresAt: s.fieldOr("expiresAt", S.nullableAsOption(S.int), undefined)
+  expiresAt: s.f("expiresAt", S.option(S.int))
 }));
 
 function postMuteCreate(body, fetch) {
@@ -379,9 +379,9 @@ function postMuteDelete(body, fetch) {
 }
 
 let postMuteListRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postMuteListResponseSchema = S.array(MisskeyIoComponentSchemas.Muting.schema);
@@ -392,8 +392,8 @@ function postMuteList(body, fetch) {
 }
 
 let postMyAppsRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  offset: s.fieldOr("offset", S.nullableAsOption(S.int), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  offset: s.f("offset", S.option(S.int))
 }));
 
 let postMyAppsResponseSchema = S.array(MisskeyIoComponentSchemas.App.schema);
@@ -422,9 +422,9 @@ function postRenoteMuteDelete(body, fetch) {
 }
 
 let postRenoteMuteListRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postRenoteMuteListResponseSchema = S.array(MisskeyIoComponentSchemas.RenoteMuting.schema);
@@ -438,11 +438,11 @@ let postSwRegisterRequestSchema = S.object(s => ({
   endpoint: s.f("endpoint", S.string),
   auth: s.f("auth", S.string),
   publickey: s.f("publickey", S.string),
-  sendReadMessage: s.fieldOr("sendReadMessage", S.nullableAsOption(S.bool), undefined)
+  sendReadMessage: s.f("sendReadMessage", S.option(S.bool))
 }));
 
 let postSwRegisterResponseSchema = S.object(s => ({
-  state: s.fieldOr("state", S.nullableAsOption(S.string), undefined),
+  state: s.f("state", S.option(S.string)),
   key: s.f("key", S.nullableAsOption(S.string)),
   userId: s.f("userId", S.string),
   endpoint: s.f("endpoint", S.string),
@@ -482,7 +482,7 @@ function postSwUnregister(body, fetch) {
 
 let postSwUpdateRegistrationRequestSchema = S.object(s => ({
   endpoint: s.f("endpoint", S.string),
-  sendReadMessage: s.fieldOr("sendReadMessage", S.nullableAsOption(S.bool), undefined)
+  sendReadMessage: s.f("sendReadMessage", S.option(S.bool))
 }));
 
 let postSwUpdateRegistrationResponseSchema = S.object(s => ({