@f3liz/rescript-misskey-api 0.6.4 → 0.6.6

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

@@ -7,13 +7,13 @@ S.enableJson();
 
 let postChannelsTimelineRequestSchema = S.object(s => ({
   channelId: s.f("channelId", 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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  allowPartial: s.fieldOr("allowPartial", S.nullableAsOption(S.bool), undefined),
-  dimension: s.fieldOr("dimension", S.nullableAsOption(S.min(S.int, 0, undefined)), 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  allowPartial: s.f("allowPartial", S.option(S.bool)),
+  dimension: s.f("dimension", S.option(S.min(S.int, 0, undefined)))
 }));
 
 let postChannelsTimelineResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -24,14 +24,14 @@ function postChannelsTimeline(body, fetch) {
 }
 
 let postNotesRequestSchema = S.object(s => ({
-  local: s.fieldOr("local", S.nullableAsOption(S.bool), undefined),
-  reply: s.fieldOr("reply", S.nullableAsOption(S.bool), undefined),
-  renote: s.fieldOr("renote", S.nullableAsOption(S.bool), undefined),
-  withFiles: s.fieldOr("withFiles", S.nullableAsOption(S.bool), undefined),
-  poll: s.fieldOr("poll", S.nullableAsOption(S.bool), undefined),
-  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)
+  local: s.f("local", S.option(S.bool)),
+  reply: s.f("reply", S.option(S.bool)),
+  renote: s.f("renote", S.option(S.bool)),
+  withFiles: s.f("withFiles", S.option(S.bool)),
+  poll: s.f("poll", S.option(S.bool)),
+  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 postNotesResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -43,9 +43,9 @@ function postNotes(body, fetch) {
 
 let postNotesChildrenRequestSchema = S.object(s => ({
   noteId: s.f("noteId", 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 postNotesChildrenResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -57,8 +57,8 @@ function postNotesChildren(body, fetch) {
 
 let postNotesConversationRequestSchema = S.object(s => ({
   noteId: s.f("noteId", S.string),
-  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 postNotesConversationResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -70,31 +70,31 @@ function postNotesConversation(body, fetch) {
 
 let postNotesCreateRequest_1Schema = S.object(s => ({
   choices: s.f("choices", S.array(S.max(S.min(S.string, 1, undefined), 50, undefined))),
-  multiple: s.fieldOr("multiple", S.nullableAsOption(S.bool), undefined),
-  expiresAt: s.fieldOr("expiresAt", S.nullableAsOption(S.int), undefined),
-  expiredAfter: s.fieldOr("expiredAfter", S.nullableAsOption(S.min(S.int, 1, undefined)), undefined)
+  multiple: s.f("multiple", S.option(S.bool)),
+  expiresAt: s.f("expiresAt", S.option(S.int)),
+  expiredAfter: s.f("expiredAfter", S.option(S.min(S.int, 1, undefined)))
 }));
 
 let postNotesCreateRequestSchema = S.object(s => ({
-  visibility: s.fieldOr("visibility", S.nullableAsOption(S.string), undefined),
-  visibleUserIds: s.fieldOr("visibleUserIds", S.nullableAsOption(S.array(S.string)), undefined),
-  cw: s.fieldOr("cw", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 100, undefined)), undefined),
-  localOnly: s.fieldOr("localOnly", S.nullableAsOption(S.bool), undefined),
-  dimension: s.fieldOr("dimension", S.nullableAsOption(S.min(S.int, 0, undefined)), undefined),
-  reactionAcceptance: s.fieldOr("reactionAcceptance", S.nullableAsOption(S.string), undefined),
-  noExtractMentions: s.fieldOr("noExtractMentions", S.nullableAsOption(S.bool), undefined),
-  noExtractHashtags: s.fieldOr("noExtractHashtags", S.nullableAsOption(S.bool), undefined),
-  noExtractEmojis: s.fieldOr("noExtractEmojis", S.nullableAsOption(S.bool), undefined),
-  replyId: s.fieldOr("replyId", S.nullableAsOption(S.string), undefined),
-  renoteId: s.fieldOr("renoteId", S.nullableAsOption(S.string), undefined),
-  channelId: s.fieldOr("channelId", S.nullableAsOption(S.string), undefined),
-  lang: s.fieldOr("lang", S.nullableAsOption(S.string), undefined),
-  text: s.fieldOr("text", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 3000, undefined)), undefined),
-  fileIds: s.fieldOr("fileIds", S.nullableAsOption(S.array(S.string)), undefined),
-  mediaIds: s.fieldOr("mediaIds", S.nullableAsOption(S.array(S.string)), undefined),
-  poll: s.fieldOr("poll", S.nullableAsOption(postNotesCreateRequest_1Schema), undefined),
-  scheduledAt: s.fieldOr("scheduledAt", S.nullableAsOption(S.int), undefined),
-  noCreatedNote: s.fieldOr("noCreatedNote", S.nullableAsOption(S.bool), undefined)
+  visibility: s.f("visibility", S.option(S.string)),
+  visibleUserIds: s.f("visibleUserIds", S.option(S.array(S.string))),
+  cw: s.f("cw", S.option(S.max(S.min(S.string, 1, undefined), 100, undefined))),
+  localOnly: s.f("localOnly", S.option(S.bool)),
+  dimension: s.f("dimension", S.option(S.min(S.int, 0, undefined))),
+  reactionAcceptance: s.f("reactionAcceptance", S.option(S.string)),
+  noExtractMentions: s.f("noExtractMentions", S.option(S.bool)),
+  noExtractHashtags: s.f("noExtractHashtags", S.option(S.bool)),
+  noExtractEmojis: s.f("noExtractEmojis", S.option(S.bool)),
+  replyId: s.f("replyId", S.option(S.string)),
+  renoteId: s.f("renoteId", S.option(S.string)),
+  channelId: s.f("channelId", S.option(S.string)),
+  lang: s.f("lang", S.option(S.string)),
+  text: s.f("text", S.option(S.max(S.min(S.string, 1, undefined), 3000, undefined))),
+  fileIds: s.f("fileIds", S.option(S.array(S.string))),
+  mediaIds: s.f("mediaIds", S.option(S.array(S.string))),
+  poll: s.f("poll", S.option(postNotesCreateRequest_1Schema)),
+  scheduledAt: s.f("scheduledAt", S.option(S.int)),
+  noCreatedNote: s.f("noCreatedNote", S.option(S.bool))
 }));
 
 let postNotesCreateResponseSchema = S.object(s => ({
@@ -134,9 +134,9 @@ function postNotesFavoritesDelete(body, fetch) {
 }
 
 let getNotesFeaturedRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  channelId: s.fieldOr("channelId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  untilId: s.f("untilId", S.option(S.string)),
+  channelId: s.f("channelId", S.option(S.string))
 }));
 
 let getNotesFeaturedResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -147,9 +147,9 @@ function getNotesFeatured(body, fetch) {
 }
 
 let postNotesFeaturedRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  channelId: s.fieldOr("channelId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  untilId: s.f("untilId", S.option(S.string)),
+  channelId: s.f("channelId", S.option(S.string))
 }));
 
 let postNotesFeaturedResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -160,14 +160,14 @@ function postNotesFeatured(body, fetch) {
 }
 
 let postNotesGlobalTimelineRequestSchema = S.object(s => ({
-  withFiles: s.fieldOr("withFiles", S.nullableAsOption(S.bool), undefined),
-  withRenotes: s.fieldOr("withRenotes", S.nullableAsOption(S.bool), undefined),
-  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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  dimension: s.fieldOr("dimension", S.nullableAsOption(S.min(S.int, 0, undefined)), undefined)
+  withFiles: s.f("withFiles", S.option(S.bool)),
+  withRenotes: s.f("withRenotes", S.option(S.bool)),
+  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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  dimension: s.f("dimension", S.option(S.min(S.int, 0, undefined)))
 }));
 
 let postNotesGlobalTimelineResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -178,19 +178,19 @@ function postNotesGlobalTimeline(body, fetch) {
 }
 
 let postNotesHybridTimelineRequestSchema = 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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  allowPartial: s.fieldOr("allowPartial", S.nullableAsOption(S.bool), undefined),
-  includeMyRenotes: s.fieldOr("includeMyRenotes", S.nullableAsOption(S.bool), undefined),
-  includeRenotedMyNotes: s.fieldOr("includeRenotedMyNotes", S.nullableAsOption(S.bool), undefined),
-  includeLocalRenotes: s.fieldOr("includeLocalRenotes", S.nullableAsOption(S.bool), undefined),
-  withFiles: s.fieldOr("withFiles", S.nullableAsOption(S.bool), undefined),
-  withRenotes: s.fieldOr("withRenotes", S.nullableAsOption(S.bool), undefined),
-  withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), undefined),
-  dimension: s.fieldOr("dimension", S.nullableAsOption(S.min(S.int, 0, undefined)), 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  allowPartial: s.f("allowPartial", S.option(S.bool)),
+  includeMyRenotes: s.f("includeMyRenotes", S.option(S.bool)),
+  includeRenotedMyNotes: s.f("includeRenotedMyNotes", S.option(S.bool)),
+  includeLocalRenotes: s.f("includeLocalRenotes", S.option(S.bool)),
+  withFiles: s.f("withFiles", S.option(S.bool)),
+  withRenotes: s.f("withRenotes", S.option(S.bool)),
+  withReplies: s.f("withReplies", S.option(S.bool)),
+  dimension: s.f("dimension", S.option(S.min(S.int, 0, undefined)))
 }));
 
 let postNotesHybridTimelineResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -201,16 +201,16 @@ function postNotesHybridTimeline(body, fetch) {
 }
 
 let postNotesLocalTimelineRequestSchema = S.object(s => ({
-  withFiles: s.fieldOr("withFiles", S.nullableAsOption(S.bool), undefined),
-  withRenotes: s.fieldOr("withRenotes", S.nullableAsOption(S.bool), undefined),
-  withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), undefined),
-  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),
-  allowPartial: s.fieldOr("allowPartial", S.nullableAsOption(S.bool), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  dimension: s.fieldOr("dimension", S.nullableAsOption(S.min(S.int, 0, undefined)), undefined)
+  withFiles: s.f("withFiles", S.option(S.bool)),
+  withRenotes: s.f("withRenotes", S.option(S.bool)),
+  withReplies: s.f("withReplies", S.option(S.bool)),
+  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)),
+  allowPartial: s.f("allowPartial", S.option(S.bool)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  dimension: s.f("dimension", S.option(S.min(S.int, 0, undefined)))
 }));
 
 let postNotesLocalTimelineResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -221,11 +221,11 @@ function postNotesLocalTimeline(body, fetch) {
 }
 
 let postNotesMentionsRequestSchema = S.object(s => ({
-  following: s.fieldOr("following", S.nullableAsOption(S.bool), undefined),
-  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),
-  visibility: s.fieldOr("visibility", S.nullableAsOption(S.string), undefined)
+  following: s.f("following", S.option(S.bool)),
+  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)),
+  visibility: s.f("visibility", S.option(S.string))
 }));
 
 let postNotesMentionsResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -236,9 +236,9 @@ function postNotesMentions(body, fetch) {
 }
 
 let postNotesPollsRecommendationRequestSchema = 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),
-  excludeChannels: s.fieldOr("excludeChannels", S.nullableAsOption(S.bool), 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)),
+  excludeChannels: s.f("excludeChannels", S.option(S.bool))
 }));
 
 let postNotesPollsRecommendationResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -260,10 +260,10 @@ function postNotesPollsVote(body, fetch) {
 
 let getNotesReactionsRequestSchema = S.object(s => ({
   noteId: s.f("noteId", S.string),
-  type: s.fieldOr("type", S.nullableAsOption(S.string), undefined),
-  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)
+  type: s.f("type", S.option(S.string)),
+  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 getNotesReactionsResponseSchema = S.array(MisskeyIoComponentSchemas.NoteReaction.schema);
@@ -275,10 +275,10 @@ function getNotesReactions(body, fetch) {
 
 let postNotesReactionsRequestSchema = S.object(s => ({
   noteId: s.f("noteId", S.string),
-  type: s.fieldOr("type", S.nullableAsOption(S.string), undefined),
-  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)
+  type: s.f("type", S.option(S.string)),
+  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 postNotesReactionsResponseSchema = S.array(MisskeyIoComponentSchemas.NoteReaction.schema);
@@ -290,9 +290,9 @@ function postNotesReactions(body, fetch) {
 
 let postNotesRenotesRequestSchema = S.object(s => ({
   noteId: s.f("noteId", 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 postNotesRenotesResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -304,9 +304,9 @@ function postNotesRenotes(body, fetch) {
 
 let postNotesRepliesRequestSchema = S.object(s => ({
   noteId: s.f("noteId", S.string),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined)
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined)))
 }));
 
 let postNotesRepliesResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -326,8 +326,8 @@ function postNotesScheduledCancel(body, fetch) {
 }
 
 let postNotesScheduledListRequestSchema = 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 postNotesScheduledListResponseSchema = S.array(MisskeyIoComponentSchemas.NoteDraft.schema);
@@ -339,13 +339,13 @@ function postNotesScheduledList(body, fetch) {
 
 let postNotesSearchRequestSchema = S.object(s => ({
   query: s.f("query", S.string),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  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),
-  host: s.fieldOr("host", S.nullableAsOption(S.string), undefined),
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined),
-  channelId: s.fieldOr("channelId", S.nullableAsOption(S.string), undefined)
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  offset: s.f("offset", S.option(S.int)),
+  host: s.f("host", S.option(S.string)),
+  userId: s.f("userId", S.option(S.string)),
+  channelId: s.f("channelId", S.option(S.string))
 }));
 
 let postNotesSearchResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -356,16 +356,16 @@ function postNotesSearch(body, fetch) {
 }
 
 let postNotesSearchByTagRequestSchema = S.object(s => ({
-  local: s.fieldOr("local", S.nullableAsOption(S.bool), undefined),
-  reply: s.fieldOr("reply", S.nullableAsOption(S.bool), undefined),
-  renote: s.fieldOr("renote", S.nullableAsOption(S.bool), undefined),
-  withFiles: s.fieldOr("withFiles", S.nullableAsOption(S.bool), undefined),
-  poll: s.fieldOr("poll", S.nullableAsOption(S.bool), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  tag: s.fieldOr("tag", S.nullableAsOption(S.min(S.string, 1, undefined)), undefined),
-  query: s.fieldOr("query", S.nullableAsOption(S.array(S.array(S.min(S.string, 1, undefined)))), undefined)
+  local: s.f("local", S.option(S.bool)),
+  reply: s.f("reply", S.option(S.bool)),
+  renote: s.f("renote", S.option(S.bool)),
+  withFiles: s.f("withFiles", S.option(S.bool)),
+  poll: s.f("poll", S.option(S.bool)),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  tag: s.f("tag", S.option(S.min(S.string, 1, undefined))),
+  query: s.f("query", S.option(S.array(S.array(S.min(S.string, 1, undefined)))))
 }));
 
 let postNotesSearchByTagResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -419,18 +419,18 @@ function postNotesThreadMutingDelete(body, fetch) {
 }
 
 let postNotesTimelineRequestSchema = 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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  allowPartial: s.fieldOr("allowPartial", S.nullableAsOption(S.bool), undefined),
-  includeMyRenotes: s.fieldOr("includeMyRenotes", S.nullableAsOption(S.bool), undefined),
-  includeRenotedMyNotes: s.fieldOr("includeRenotedMyNotes", S.nullableAsOption(S.bool), undefined),
-  includeLocalRenotes: s.fieldOr("includeLocalRenotes", S.nullableAsOption(S.bool), undefined),
-  withFiles: s.fieldOr("withFiles", S.nullableAsOption(S.bool), undefined),
-  withRenotes: s.fieldOr("withRenotes", S.nullableAsOption(S.bool), undefined),
-  dimension: s.fieldOr("dimension", S.nullableAsOption(S.min(S.int, 0, undefined)), 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  allowPartial: s.f("allowPartial", S.option(S.bool)),
+  includeMyRenotes: s.f("includeMyRenotes", S.option(S.bool)),
+  includeRenotedMyNotes: s.f("includeRenotedMyNotes", S.option(S.bool)),
+  includeLocalRenotes: s.f("includeLocalRenotes", S.option(S.bool)),
+  withFiles: s.f("withFiles", S.option(S.bool)),
+  withRenotes: s.f("withRenotes", S.option(S.bool)),
+  dimension: s.f("dimension", S.option(S.min(S.int, 0, undefined)))
 }));
 
 let postNotesTimelineResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -466,17 +466,17 @@ function postNotesUnrenote(body, fetch) {
 
 let postNotesUserListTimelineRequestSchema = S.object(s => ({
   listId: s.f("listId", 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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  allowPartial: s.fieldOr("allowPartial", S.nullableAsOption(S.bool), undefined),
-  includeMyRenotes: s.fieldOr("includeMyRenotes", S.nullableAsOption(S.bool), undefined),
-  includeRenotedMyNotes: s.fieldOr("includeRenotedMyNotes", S.nullableAsOption(S.bool), undefined),
-  includeLocalRenotes: s.fieldOr("includeLocalRenotes", S.nullableAsOption(S.bool), undefined),
-  withRenotes: s.fieldOr("withRenotes", S.nullableAsOption(S.bool), undefined),
-  withFiles: s.fieldOr("withFiles", S.nullableAsOption(S.bool), 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  allowPartial: s.f("allowPartial", S.option(S.bool)),
+  includeMyRenotes: s.f("includeMyRenotes", S.option(S.bool)),
+  includeRenotedMyNotes: s.f("includeRenotedMyNotes", S.option(S.bool)),
+  includeLocalRenotes: s.f("includeLocalRenotes", S.option(S.bool)),
+  withRenotes: s.f("withRenotes", S.option(S.bool)),
+  withFiles: s.f("withFiles", S.option(S.bool))
 }));
 
 let postNotesUserListTimelineResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -496,8 +496,8 @@ function postPromoRead(body, fetch) {
 }
 
 let getUsersFeaturedNotesRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), 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))),
+  untilId: s.f("untilId", S.option(S.string)),
   userId: s.f("userId", S.string)
 }));
 
@@ -509,8 +509,8 @@ function getUsersFeaturedNotes(body, fetch) {
 }
 
 let postUsersFeaturedNotesRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), 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))),
+  untilId: s.f("untilId", S.option(S.string)),
   userId: s.f("userId", S.string)
 }));
 

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

@@ -6,8 +6,8 @@ S.enableJson();
 
 let postNotificationsCreateRequestSchema = S.object(s => ({
   body: s.f("body", S.string),
-  header: s.fieldOr("header", S.nullableAsOption(S.string), undefined),
-  icon: s.fieldOr("icon", S.nullableAsOption(S.string), undefined)
+  header: s.f("header", S.option(S.string)),
+  icon: s.f("icon", S.option(S.string))
 }));
 
 function postNotificationsCreate(body, fetch) {

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

@@ -8,15 +8,15 @@ S.enableJson();
 let postPagesCreateRequestSchema = S.object(s => ({
   title: s.f("title", S.string),
   name: s.f("name", S.pattern(S.min(S.string, 1, undefined), /^[a-zA-Z0-9_-]+$/, undefined)),
-  summary: s.fieldOr("summary", S.nullableAsOption(S.string), undefined),
+  summary: s.f("summary", S.option(S.string)),
   content: s.f("content", S.array(S.dict(S.json))),
   variables: s.f("variables", S.array(S.dict(S.json))),
   script: s.f("script", S.string),
-  eyeCatchingImageId: s.fieldOr("eyeCatchingImageId", S.nullableAsOption(S.string), undefined),
-  font: s.fieldOr("font", S.nullableAsOption(S.string), undefined),
-  alignCenter: s.fieldOr("alignCenter", S.nullableAsOption(S.bool), undefined),
-  hideTitleWhenPinned: s.fieldOr("hideTitleWhenPinned", S.nullableAsOption(S.bool), undefined),
-  visibility: s.fieldOr("visibility", S.nullableAsOption(S.string), undefined)
+  eyeCatchingImageId: s.f("eyeCatchingImageId", S.option(S.string)),
+  font: s.f("font", S.option(S.string)),
+  alignCenter: s.f("alignCenter", S.option(S.bool)),
+  hideTitleWhenPinned: s.f("hideTitleWhenPinned", S.option(S.bool)),
+  visibility: s.f("visibility", S.option(S.string))
 }));
 
 let postPagesCreateResponseSchema = MisskeyIoComponentSchemas.Page.schema;
@@ -51,9 +51,9 @@ function postPagesLike(body, fetch) {
 }
 
 let postPagesShowRequestSchema = S.object(s => ({
-  pageId: s.fieldOr("pageId", S.nullableAsOption(S.string), undefined),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  username: s.fieldOr("username", S.nullableAsOption(S.string), undefined)
+  pageId: s.f("pageId", S.option(S.string)),
+  name: s.f("name", S.option(S.string)),
+  username: s.f("username", S.option(S.string))
 }));
 
 let postPagesShowResponseSchema = MisskeyIoComponentSchemas.Page.schema;
@@ -74,17 +74,17 @@ function postPagesUnlike(body, fetch) {
 
 let postPagesUpdateRequestSchema = S.object(s => ({
   pageId: s.f("pageId", S.string),
-  title: s.fieldOr("title", S.nullableAsOption(S.string), undefined),
-  name: s.fieldOr("name", S.nullableAsOption(S.pattern(S.min(S.string, 1, undefined), /^[a-zA-Z0-9_-]+$/, undefined)), undefined),
-  summary: s.fieldOr("summary", S.nullableAsOption(S.string), undefined),
-  content: s.fieldOr("content", S.nullableAsOption(S.array(S.dict(S.json))), undefined),
-  variables: s.fieldOr("variables", S.nullableAsOption(S.array(S.dict(S.json))), undefined),
-  script: s.fieldOr("script", S.nullableAsOption(S.string), undefined),
-  eyeCatchingImageId: s.fieldOr("eyeCatchingImageId", S.nullableAsOption(S.string), undefined),
-  font: s.fieldOr("font", S.nullableAsOption(S.string), undefined),
-  alignCenter: s.fieldOr("alignCenter", S.nullableAsOption(S.bool), undefined),
-  hideTitleWhenPinned: s.fieldOr("hideTitleWhenPinned", S.nullableAsOption(S.bool), undefined),
-  visibility: s.fieldOr("visibility", S.nullableAsOption(S.string), undefined)
+  title: s.f("title", S.option(S.string)),
+  name: s.f("name", S.option(S.pattern(S.min(S.string, 1, undefined), /^[a-zA-Z0-9_-]+$/, undefined))),
+  summary: s.f("summary", S.option(S.string)),
+  content: s.f("content", S.option(S.array(S.dict(S.json)))),
+  variables: s.f("variables", S.option(S.array(S.dict(S.json)))),
+  script: s.f("script", S.option(S.string)),
+  eyeCatchingImageId: s.f("eyeCatchingImageId", S.option(S.string)),
+  font: s.f("font", S.option(S.string)),
+  alignCenter: s.f("alignCenter", S.option(S.bool)),
+  hideTitleWhenPinned: s.f("hideTitleWhenPinned", S.option(S.bool)),
+  visibility: s.f("visibility", S.option(S.string))
 }));
 
 function postPagesUpdate(body, fetch) {

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

@@ -13,12 +13,12 @@ function postRolesList(fetch) {
 
 let postRolesNotesRequestSchema = S.object(s => ({
   roleId: s.f("roleId", 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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  dimension: s.fieldOr("dimension", S.nullableAsOption(S.min(S.int, 0, undefined)), 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  dimension: s.f("dimension", S.option(S.min(S.int, 0, undefined)))
 }));
 
 let postRolesNotesResponseSchema = S.array(MisskeyIoComponentSchemas.Note.schema);
@@ -41,9 +41,9 @@ function postRolesShow(body, fetch) {
 
 let postRolesUsersRequestSchema = S.object(s => ({
   roleId: s.f("roleId", S.string),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined)
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined)))
 }));
 
 let postRolesUsersResponse_1Schema = S.object(s => ({