@f3liz/rescript-misskey-api 0.6.5 → 0.6.6

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

@@ -38,9 +38,9 @@ function postAdminAbuseReportResolverDelete(body, fetch) {
 }
 
 let postAdminAbuseReportResolverListRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.float, 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.float, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postAdminAbuseReportResolverListResponse_1Schema = S.object(s => ({
@@ -61,12 +61,12 @@ function postAdminAbuseReportResolverList(body, fetch) {
 
 let postAdminAbuseReportResolverUpdateRequestSchema = S.object(s => ({
   resolverId: s.f("resolverId", S.string),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  targetUserPattern: s.fieldOr("targetUserPattern", S.nullableAsOption(S.string), undefined),
-  reporterPattern: s.fieldOr("reporterPattern", S.nullableAsOption(S.string), undefined),
-  reportContentPattern: s.fieldOr("reportContentPattern", S.nullableAsOption(S.string), undefined),
-  expiresAt: s.fieldOr("expiresAt", S.nullableAsOption(S.string), undefined),
-  forward: s.fieldOr("forward", S.nullableAsOption(S.bool), undefined)
+  name: s.f("name", S.option(S.string)),
+  targetUserPattern: s.f("targetUserPattern", S.option(S.string)),
+  reporterPattern: s.f("reporterPattern", S.option(S.string)),
+  reportContentPattern: s.f("reportContentPattern", S.option(S.string)),
+  expiresAt: s.f("expiresAt", S.option(S.string)),
+  forward: s.f("forward", S.option(S.bool))
 }));
 
 function postAdminAbuseReportResolverUpdate(body, fetch) {
@@ -78,8 +78,8 @@ let postAdminAbuseReportNotificationRecipientCreateRequestSchema = S.object(s =>
   isActive: s.f("isActive", S.bool),
   name: s.f("name", S.max(S.min(S.string, 1, undefined), 255, undefined)),
   method: s.f("method", S.string),
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined),
-  systemWebhookId: s.fieldOr("systemWebhookId", S.nullableAsOption(S.string), undefined)
+  userId: s.f("userId", S.option(S.string)),
+  systemWebhookId: s.f("systemWebhookId", S.option(S.string))
 }));
 
 let postAdminAbuseReportNotificationRecipientCreateResponseSchema = MisskeyIoComponentSchemas.AbuseReportNotificationRecipient.schema;
@@ -99,7 +99,7 @@ function postAdminAbuseReportNotificationRecipientDelete(body, fetch) {
 }
 
 let postAdminAbuseReportNotificationRecipientListRequestSchema = S.object(s => ({
-  method: s.fieldOr("method", S.nullableAsOption(S.array(S.string)), undefined)
+  method: s.f("method", S.option(S.array(S.string)))
 }));
 
 let postAdminAbuseReportNotificationRecipientListResponseSchema = S.array(MisskeyIoComponentSchemas.AbuseReportNotificationRecipient.schema);
@@ -125,8 +125,8 @@ let postAdminAbuseReportNotificationRecipientUpdateRequestSchema = S.object(s =>
   isActive: s.f("isActive", S.bool),
   name: s.f("name", S.max(S.min(S.string, 1, undefined), 255, undefined)),
   method: s.f("method", S.string),
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined),
-  systemWebhookId: s.fieldOr("systemWebhookId", S.nullableAsOption(S.string), undefined)
+  userId: s.f("userId", S.option(S.string)),
+  systemWebhookId: s.f("systemWebhookId", S.option(S.string))
 }));
 
 let postAdminAbuseReportNotificationRecipientUpdateResponseSchema = MisskeyIoComponentSchemas.AbuseReportNotificationRecipient.schema;
@@ -137,14 +137,14 @@ function postAdminAbuseReportNotificationRecipientUpdate(body, fetch) {
 }
 
 let postAdminAbuseUserReportsRequestSchema = 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),
-  state: s.fieldOr("state", S.nullableAsOption(S.string), undefined),
-  reporterOrigin: s.fieldOr("reporterOrigin", S.nullableAsOption(S.string), undefined),
-  targetUserOrigin: s.fieldOr("targetUserOrigin", S.nullableAsOption(S.string), undefined),
-  forwarded: s.fieldOr("forwarded", S.nullableAsOption(S.bool), undefined),
-  category: s.fieldOr("category", 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)),
+  state: s.f("state", S.option(S.string)),
+  reporterOrigin: s.f("reporterOrigin", S.option(S.string)),
+  targetUserOrigin: s.f("targetUserOrigin", S.option(S.string)),
+  forwarded: s.f("forwarded", S.option(S.bool)),
+  category: s.f("category", S.option(S.string))
 }));
 
 let postAdminAbuseUserReportsResponse_1Schema = S.object(s => ({
@@ -159,7 +159,7 @@ let postAdminAbuseUserReportsResponse_1Schema = S.object(s => ({
   assigneeId: s.f("assigneeId", S.nullableAsOption(S.string)),
   reporter: s.f("reporter", MisskeyIoComponentSchemas.UserDetailed.schema),
   targetUser: s.f("targetUser", MisskeyIoComponentSchemas.UserDetailed.schema),
-  assignee: s.fieldOr("assignee", S.nullableAsOption(MisskeyIoComponentSchemas.UserDetailed.schema), undefined),
+  assignee: s.f("assignee", S.option(MisskeyIoComponentSchemas.UserDetailed.schema)),
   category: s.f("category", S.string),
   moderationNote: s.f("moderationNote", S.nullableAsOption(S.string))
 }));
@@ -174,7 +174,7 @@ function postAdminAbuseUserReports(body, fetch) {
 let postAdminAccountsCreateRequestSchema = S.object(s => ({
   username: s.f("username", S.pattern(S.string, /^\w{1,20}$/, undefined)),
   password: s.f("password", S.min(S.string, 1, undefined)),
-  setupPassword: s.fieldOr("setupPassword", S.nullableAsOption(S.string), undefined)
+  setupPassword: s.f("setupPassword", S.option(S.string))
 }));
 
 let postAdminAccountsCreateResponseSchema = MisskeyIoComponentSchemas.MeDetailed.schema;
@@ -186,7 +186,7 @@ function postAdminAccountsCreate(body, fetch) {
 
 let postAdminAccountsDeleteRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  soft: s.fieldOr("soft", S.nullableAsOption(S.bool), undefined)
+  soft: s.f("soft", S.option(S.bool))
 }));
 
 function postAdminAccountsDelete(body, fetch) {
@@ -206,12 +206,12 @@ function postAdminAccountsFindByEmail(body, fetch) {
 }
 
 let postAdminAccountsPendingListRequestSchema = 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),
-  sort: s.fieldOr("sort", S.nullableAsOption(S.string), undefined),
-  username: s.fieldOr("username", S.nullableAsOption(S.string), undefined),
-  email: s.fieldOr("email", S.nullableAsOption(S.string), undefined),
-  code: s.fieldOr("code", S.nullableAsOption(S.string), 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)),
+  sort: s.f("sort", S.option(S.string)),
+  username: s.f("username", S.option(S.string)),
+  email: s.f("email", S.option(S.string)),
+  code: s.f("code", S.option(S.string))
 }));
 
 let postAdminAccountsPendingListResponse_1Schema = S.object(s => ({
@@ -219,7 +219,7 @@ let postAdminAccountsPendingListResponse_1Schema = S.object(s => ({
   createdAt: s.f("createdAt", S.string),
   code: s.f("code", S.string),
   username: s.f("username", S.string),
-  email: s.fieldOr("email", S.nullableAsOption(S.string), undefined)
+  email: s.f("email", S.option(S.string))
 }));
 
 let postAdminAccountsPendingListResponseSchema = S.array(postAdminAccountsPendingListResponse_1Schema);
@@ -230,8 +230,8 @@ function postAdminAccountsPendingList(body, fetch) {
 }
 
 let postAdminAccountsPendingRevokeRequestSchema = S.object(s => ({
-  id: s.fieldOr("id", S.nullableAsOption(S.string), undefined),
-  code: s.fieldOr("code", S.nullableAsOption(S.string), undefined)
+  id: s.f("id", S.option(S.string)),
+  code: s.f("code", S.option(S.string))
 }));
 
 function postAdminAccountsPendingRevoke(body, fetch) {
@@ -249,7 +249,7 @@ let postAdminAdCreateRequestSchema = S.object(s => ({
   startsAt: s.f("startsAt", S.int),
   imageUrl: s.f("imageUrl", S.min(S.string, 1, undefined)),
   dayOfWeek: s.f("dayOfWeek", S.int),
-  isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), undefined)
+  isSensitive: s.f("isSensitive", S.option(S.bool))
 }));
 
 let postAdminAdCreateResponseSchema = MisskeyIoComponentSchemas.Ad.schema;
@@ -269,10 +269,10 @@ function postAdminAdDelete(body, fetch) {
 }
 
 let postAdminAdListRequestSchema = 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),
-  publishing: s.fieldOr("publishing", 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)),
+  publishing: s.f("publishing", S.option(S.bool))
 }));
 
 let postAdminAdListResponseSchema = S.array(MisskeyIoComponentSchemas.Ad.schema);
@@ -284,16 +284,16 @@ function postAdminAdList(body, fetch) {
 
 let postAdminAdUpdateRequestSchema = S.object(s => ({
   id: s.f("id", S.string),
-  memo: s.fieldOr("memo", S.nullableAsOption(S.string), undefined),
-  url: s.fieldOr("url", S.nullableAsOption(S.min(S.string, 1, undefined)), undefined),
-  imageUrl: s.fieldOr("imageUrl", S.nullableAsOption(S.min(S.string, 1, undefined)), undefined),
-  place: s.fieldOr("place", S.nullableAsOption(S.string), undefined),
-  priority: s.fieldOr("priority", S.nullableAsOption(S.string), undefined),
-  ratio: s.fieldOr("ratio", S.nullableAsOption(S.int), undefined),
-  expiresAt: s.fieldOr("expiresAt", S.nullableAsOption(S.int), undefined),
-  startsAt: s.fieldOr("startsAt", S.nullableAsOption(S.int), undefined),
-  dayOfWeek: s.fieldOr("dayOfWeek", S.nullableAsOption(S.int), undefined),
-  isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), undefined)
+  memo: s.f("memo", S.option(S.string)),
+  url: s.f("url", S.option(S.min(S.string, 1, undefined))),
+  imageUrl: s.f("imageUrl", S.option(S.min(S.string, 1, undefined))),
+  place: s.f("place", S.option(S.string)),
+  priority: s.f("priority", S.option(S.string)),
+  ratio: s.f("ratio", S.option(S.int)),
+  expiresAt: s.f("expiresAt", S.option(S.int)),
+  startsAt: s.f("startsAt", S.option(S.int)),
+  dayOfWeek: s.f("dayOfWeek", S.option(S.int)),
+  isSensitive: s.f("isSensitive", S.option(S.bool))
 }));
 
 function postAdminAdUpdate(body, fetch) {
@@ -305,15 +305,15 @@ let postAdminAnnouncementsCreateRequestSchema = S.object(s => ({
   title: s.f("title", S.min(S.string, 1, undefined)),
   text: s.f("text", S.min(S.string, 1, undefined)),
   imageUrl: s.f("imageUrl", S.nullableAsOption(S.min(S.string, 0, undefined))),
-  icon: s.fieldOr("icon", S.nullableAsOption(S.string), undefined),
-  display: s.fieldOr("display", S.nullableAsOption(S.string), undefined),
-  forExistingUsers: s.fieldOr("forExistingUsers", S.nullableAsOption(S.bool), undefined),
-  needConfirmationToRead: s.fieldOr("needConfirmationToRead", S.nullableAsOption(S.bool), undefined),
-  needEnrollmentTutorialToRead: s.fieldOr("needEnrollmentTutorialToRead", S.nullableAsOption(S.bool), undefined),
-  closeDuration: s.fieldOr("closeDuration", S.nullableAsOption(S.float), undefined),
-  displayOrder: s.fieldOr("displayOrder", S.nullableAsOption(S.float), undefined),
-  silence: s.fieldOr("silence", S.nullableAsOption(S.bool), undefined),
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined)
+  icon: s.f("icon", S.option(S.string)),
+  display: s.f("display", S.option(S.string)),
+  forExistingUsers: s.f("forExistingUsers", S.option(S.bool)),
+  needConfirmationToRead: s.f("needConfirmationToRead", S.option(S.bool)),
+  needEnrollmentTutorialToRead: s.f("needEnrollmentTutorialToRead", S.option(S.bool)),
+  closeDuration: s.f("closeDuration", S.option(S.float)),
+  displayOrder: s.f("displayOrder", S.option(S.float)),
+  silence: s.f("silence", S.option(S.bool)),
+  userId: s.f("userId", S.option(S.string))
 }));
 
 let postAdminAnnouncementsCreateResponseSchema = S.object(s => ({
@@ -331,7 +331,7 @@ let postAdminAnnouncementsCreateResponseSchema = S.object(s => ({
   closeDuration: s.f("closeDuration", S.float),
   displayOrder: s.f("displayOrder", S.float),
   silence: s.f("silence", S.bool),
-  isRead: s.fieldOr("isRead", S.nullableAsOption(S.bool), undefined)
+  isRead: s.f("isRead", S.option(S.bool))
 }));
 
 function postAdminAnnouncementsCreate(body, fetch) {
@@ -349,10 +349,10 @@ function postAdminAnnouncementsDelete(body, fetch) {
 }
 
 let postAdminAnnouncementsListRequestSchema = 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),
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined),
-  status: s.fieldOr("status", S.nullableAsOption(S.string), 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)),
+  userId: s.f("userId", S.option(S.string)),
+  status: s.f("status", S.option(S.string))
 }));
 
 let postAdminAnnouncementsListResponse_1Schema = S.object(s => ({
@@ -386,18 +386,18 @@ function postAdminAnnouncementsList(body, fetch) {
 
 let postAdminAnnouncementsUpdateRequestSchema = S.object(s => ({
   id: s.f("id", S.string),
-  title: s.fieldOr("title", S.nullableAsOption(S.min(S.string, 1, undefined)), undefined),
-  text: s.fieldOr("text", S.nullableAsOption(S.min(S.string, 1, undefined)), undefined),
-  imageUrl: s.fieldOr("imageUrl", S.nullableAsOption(S.min(S.string, 0, undefined)), undefined),
-  icon: s.fieldOr("icon", S.nullableAsOption(S.string), undefined),
-  display: s.fieldOr("display", S.nullableAsOption(S.string), undefined),
-  forExistingUsers: s.fieldOr("forExistingUsers", S.nullableAsOption(S.bool), undefined),
-  needConfirmationToRead: s.fieldOr("needConfirmationToRead", S.nullableAsOption(S.bool), undefined),
-  needEnrollmentTutorialToRead: s.fieldOr("needEnrollmentTutorialToRead", S.nullableAsOption(S.bool), undefined),
-  closeDuration: s.fieldOr("closeDuration", S.nullableAsOption(S.float), undefined),
-  displayOrder: s.fieldOr("displayOrder", S.nullableAsOption(S.float), undefined),
-  silence: s.fieldOr("silence", S.nullableAsOption(S.bool), undefined),
-  isActive: s.fieldOr("isActive", S.nullableAsOption(S.bool), undefined)
+  title: s.f("title", S.option(S.min(S.string, 1, undefined))),
+  text: s.f("text", S.option(S.min(S.string, 1, undefined))),
+  imageUrl: s.f("imageUrl", S.option(S.min(S.string, 0, undefined))),
+  icon: s.f("icon", S.option(S.string)),
+  display: s.f("display", S.option(S.string)),
+  forExistingUsers: s.f("forExistingUsers", S.option(S.bool)),
+  needConfirmationToRead: s.f("needConfirmationToRead", S.option(S.bool)),
+  needEnrollmentTutorialToRead: s.f("needEnrollmentTutorialToRead", S.option(S.bool)),
+  closeDuration: s.f("closeDuration", S.option(S.float)),
+  displayOrder: s.f("displayOrder", S.option(S.float)),
+  silence: s.f("silence", S.option(S.bool)),
+  isActive: s.f("isActive", S.option(S.bool))
 }));
 
 function postAdminAnnouncementsUpdate(body, fetch) {
@@ -409,7 +409,7 @@ let postAdminAvatarDecorationsCreateRequestSchema = S.object(s => ({
   name: s.f("name", S.min(S.string, 1, undefined)),
   description: s.f("description", S.string),
   url: s.f("url", S.min(S.string, 1, undefined)),
-  roleIdsThatCanBeUsedThisDecoration: s.fieldOr("roleIdsThatCanBeUsedThisDecoration", S.nullableAsOption(S.array(S.string)), undefined)
+  roleIdsThatCanBeUsedThisDecoration: s.f("roleIdsThatCanBeUsedThisDecoration", S.option(S.array(S.string)))
 }));
 
 let postAdminAvatarDecorationsCreateResponseSchema = S.object(s => ({
@@ -437,10 +437,10 @@ function postAdminAvatarDecorationsDelete(body, fetch) {
 }
 
 let postAdminAvatarDecorationsListRequestSchema = 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),
-  userId: s.fieldOr("userId", 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)),
+  userId: s.f("userId", S.option(S.string))
 }));
 
 let postAdminAvatarDecorationsListResponse_1Schema = S.object(s => ({
@@ -462,10 +462,10 @@ function postAdminAvatarDecorationsList(body, fetch) {
 
 let postAdminAvatarDecorationsUpdateRequestSchema = S.object(s => ({
   id: s.f("id", S.string),
-  name: s.fieldOr("name", S.nullableAsOption(S.min(S.string, 1, undefined)), undefined),
-  description: s.fieldOr("description", S.nullableAsOption(S.string), undefined),
-  url: s.fieldOr("url", S.nullableAsOption(S.min(S.string, 1, undefined)), undefined),
-  roleIdsThatCanBeUsedThisDecoration: s.fieldOr("roleIdsThatCanBeUsedThisDecoration", S.nullableAsOption(S.array(S.string)), undefined)
+  name: s.f("name", S.option(S.min(S.string, 1, undefined))),
+  description: s.f("description", S.option(S.string)),
+  url: s.f("url", S.option(S.min(S.string, 1, undefined))),
+  roleIdsThatCanBeUsedThisDecoration: s.f("roleIdsThatCanBeUsedThisDecoration", S.option(S.array(S.string)))
 }));
 
 function postAdminAvatarDecorationsUpdate(body, fetch) {
@@ -498,10 +498,10 @@ function postAdminCaptchaCurrent(fetch) {
 
 let postAdminCaptchaSaveRequestSchema = S.object(s => ({
   provider: s.f("provider", S.string),
-  captchaResult: s.fieldOr("captchaResult", S.nullableAsOption(S.string), undefined),
-  sitekey: s.fieldOr("sitekey", S.nullableAsOption(S.string), undefined),
-  secret: s.fieldOr("secret", S.nullableAsOption(S.string), undefined),
-  instanceUrl: s.fieldOr("instanceUrl", S.nullableAsOption(S.string), undefined)
+  captchaResult: s.f("captchaResult", S.option(S.string)),
+  sitekey: s.f("sitekey", S.option(S.string)),
+  secret: s.f("secret", S.option(S.string)),
+  instanceUrl: s.f("instanceUrl", S.option(S.string))
 }));
 
 function postAdminCaptchaSave(body, fetch) {
@@ -527,13 +527,13 @@ function postAdminDriveDeleteAllFilesOfAUser(body, fetch) {
 }
 
 let postAdminDriveFilesRequestSchema = 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),
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined),
-  type: s.fieldOr("type", S.nullableAsOption(S.pattern(S.string, /^[a-zA-Z0-9\/\*-]+$/, undefined)), undefined),
-  origin: s.fieldOr("origin", S.nullableAsOption(S.string), undefined),
-  hostname: s.fieldOr("hostname", 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)),
+  userId: s.f("userId", S.option(S.string)),
+  type: s.f("type", S.option(S.pattern(S.string, /^[a-zA-Z0-9\/\*-]+$/, undefined))),
+  origin: s.f("origin", S.option(S.string)),
+  hostname: s.f("hostname", S.option(S.string))
 }));
 
 let postAdminDriveFilesResponseSchema = S.array(MisskeyIoComponentSchemas.DriveFile.schema);
@@ -544,15 +544,15 @@ function postAdminDriveFiles(body, fetch) {
 }
 
 let postAdminDriveShowFileRequestSchema = S.object(s => ({
-  fileId: s.fieldOr("fileId", S.nullableAsOption(S.string), undefined),
-  url: s.fieldOr("url", S.nullableAsOption(S.string), undefined)
+  fileId: s.f("fileId", S.option(S.string)),
+  url: s.f("url", S.option(S.string))
 }));
 
 let postAdminDriveShowFileResponse_1Schema = S.object(s => ({
-  width: s.fieldOr("width", S.nullableAsOption(S.float), undefined),
-  height: s.fieldOr("height", S.nullableAsOption(S.float), undefined),
-  orientation: s.fieldOr("orientation", S.nullableAsOption(S.float), undefined),
-  avgColor: s.fieldOr("avgColor", S.nullableAsOption(S.string), undefined)
+  width: s.f("width", S.option(S.float)),
+  height: s.f("height", S.option(S.float)),
+  orientation: s.f("orientation", S.option(S.float)),
+  avgColor: s.f("avgColor", S.option(S.string))
 }));
 
 let postAdminDriveShowFileResponseSchema = S.object(s => ({
@@ -589,15 +589,15 @@ function postAdminDriveShowFile(body, fetch) {
 let postAdminEmojiAddRequestSchema = S.object(s => ({
   name: s.f("name", S.pattern(S.string, /^[a-zA-Z0-9_]+$/, undefined)),
   fileId: s.f("fileId", S.string),
-  category: s.fieldOr("category", S.nullableAsOption(S.string), undefined),
-  aliases: s.fieldOr("aliases", S.nullableAsOption(S.array(S.string)), undefined),
-  license: s.fieldOr("license", S.nullableAsOption(S.string), undefined),
-  isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), undefined),
-  localOnly: s.fieldOr("localOnly", S.nullableAsOption(S.bool), undefined),
-  requestedBy: s.fieldOr("requestedBy", S.nullableAsOption(S.string), undefined),
-  memo: s.fieldOr("memo", S.nullableAsOption(S.string), undefined),
-  roleIdsThatCanBeUsedThisEmojiAsReaction: s.fieldOr("roleIdsThatCanBeUsedThisEmojiAsReaction", S.nullableAsOption(S.array(S.string)), undefined),
-  roleIdsThatCanNotBeUsedThisEmojiAsReaction: s.fieldOr("roleIdsThatCanNotBeUsedThisEmojiAsReaction", S.nullableAsOption(S.array(S.string)), undefined)
+  category: s.f("category", S.option(S.string)),
+  aliases: s.f("aliases", S.option(S.array(S.string))),
+  license: s.f("license", S.option(S.string)),
+  isSensitive: s.f("isSensitive", S.option(S.bool)),
+  localOnly: s.f("localOnly", S.option(S.bool)),
+  requestedBy: s.f("requestedBy", S.option(S.string)),
+  memo: s.f("memo", S.option(S.string)),
+  roleIdsThatCanBeUsedThisEmojiAsReaction: s.f("roleIdsThatCanBeUsedThisEmojiAsReaction", S.option(S.array(S.string))),
+  roleIdsThatCanNotBeUsedThisEmojiAsReaction: s.f("roleIdsThatCanNotBeUsedThisEmojiAsReaction", S.option(S.array(S.string)))
 }));
 
 let postAdminEmojiAddResponseSchema = MisskeyIoComponentSchemas.EmojiDetailed.schema;
@@ -649,10 +649,10 @@ function postAdminEmojiDeleteBulk(body, fetch) {
 }
 
 let postAdminEmojiListRequestSchema = S.object(s => ({
-  query: s.fieldOr("query", 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)
+  query: s.f("query", 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 postAdminEmojiListResponse_1Schema = S.object(s => ({
@@ -672,11 +672,11 @@ function postAdminEmojiList(body, fetch) {
 }
 
 let postAdminEmojiListRemoteRequestSchema = S.object(s => ({
-  query: s.fieldOr("query", S.nullableAsOption(S.string), undefined),
-  host: s.fieldOr("host", 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)
+  query: s.f("query", S.option(S.string)),
+  host: s.f("host", 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 postAdminEmojiListRemoteResponse_1Schema = S.object(s => ({
@@ -717,7 +717,7 @@ function postAdminEmojiSetAliasesBulk(body, fetch) {
 
 let postAdminEmojiSetCategoryBulkRequestSchema = S.object(s => ({
   ids: s.f("ids", S.array(S.string)),
-  category: s.fieldOr("category", S.nullableAsOption(S.string), undefined)
+  category: s.f("category", S.option(S.string))
 }));
 
 function postAdminEmojiSetCategoryBulk(body, fetch) {
@@ -727,7 +727,7 @@ function postAdminEmojiSetCategoryBulk(body, fetch) {
 
 let postAdminEmojiSetLicenseBulkRequestSchema = S.object(s => ({
   ids: s.f("ids", S.array(S.string)),
-  license: s.fieldOr("license", S.nullableAsOption(S.string), undefined)
+  license: s.f("license", S.option(S.string))
 }));
 
 function postAdminEmojiSetLicenseBulk(body, fetch) {
@@ -736,18 +736,18 @@ function postAdminEmojiSetLicenseBulk(body, fetch) {
 }
 
 let postAdminEmojiUpdateRequestSchema = S.object(s => ({
-  id: s.fieldOr("id", S.nullableAsOption(S.string), undefined),
-  name: s.fieldOr("name", S.nullableAsOption(S.pattern(S.string, /^[a-zA-Z0-9_]+$/, undefined)), undefined),
-  fileId: s.fieldOr("fileId", S.nullableAsOption(S.string), undefined),
-  category: s.fieldOr("category", S.nullableAsOption(S.string), undefined),
-  aliases: s.fieldOr("aliases", S.nullableAsOption(S.array(S.string)), undefined),
-  license: s.fieldOr("license", S.nullableAsOption(S.string), undefined),
-  isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), undefined),
-  localOnly: s.fieldOr("localOnly", S.nullableAsOption(S.bool), undefined),
-  requestedBy: s.fieldOr("requestedBy", S.nullableAsOption(S.string), undefined),
-  memo: s.fieldOr("memo", S.nullableAsOption(S.string), undefined),
-  roleIdsThatCanBeUsedThisEmojiAsReaction: s.fieldOr("roleIdsThatCanBeUsedThisEmojiAsReaction", S.nullableAsOption(S.array(S.string)), undefined),
-  roleIdsThatCanNotBeUsedThisEmojiAsReaction: s.fieldOr("roleIdsThatCanNotBeUsedThisEmojiAsReaction", S.nullableAsOption(S.array(S.string)), undefined)
+  id: s.f("id", S.option(S.string)),
+  name: s.f("name", S.option(S.pattern(S.string, /^[a-zA-Z0-9_]+$/, undefined))),
+  fileId: s.f("fileId", S.option(S.string)),
+  category: s.f("category", S.option(S.string)),
+  aliases: s.f("aliases", S.option(S.array(S.string))),
+  license: s.f("license", S.option(S.string)),
+  isSensitive: s.f("isSensitive", S.option(S.bool)),
+  localOnly: s.f("localOnly", S.option(S.bool)),
+  requestedBy: s.f("requestedBy", S.option(S.string)),
+  memo: s.f("memo", S.option(S.string)),
+  roleIdsThatCanBeUsedThisEmojiAsReaction: s.f("roleIdsThatCanBeUsedThisEmojiAsReaction", S.option(S.array(S.string))),
+  roleIdsThatCanNotBeUsedThisEmojiAsReaction: s.f("roleIdsThatCanNotBeUsedThisEmojiAsReaction", S.option(S.array(S.string)))
 }));
 
 function postAdminEmojiUpdate(body, fetch) {
@@ -784,8 +784,8 @@ function postAdminFederationRemoveAllFollowing(body, fetch) {
 
 let postAdminFederationUpdateInstanceRequestSchema = S.object(s => ({
   host: s.f("host", S.string),
-  isSuspended: s.fieldOr("isSuspended", S.nullableAsOption(S.bool), undefined),
-  moderationNote: s.fieldOr("moderationNote", S.nullableAsOption(S.string), undefined)
+  isSuspended: s.f("isSuspended", S.option(S.bool)),
+  moderationNote: s.f("moderationNote", S.option(S.string))
 }));
 
 function postAdminFederationUpdateInstance(body, fetch) {
@@ -837,8 +837,8 @@ function postAdminGetUserIps(body, fetch) {
 
 let postAdminIndieAuthCreateRequestSchema = S.object(s => ({
   id: s.f("id", S.min(S.string, 1, undefined)),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  redirectUris: s.fieldOr("redirectUris", S.nullableAsOption(S.array(S.string)), undefined)
+  name: s.f("name", S.option(S.string)),
+  redirectUris: s.f("redirectUris", S.option(S.array(S.string)))
 }));
 
 let postAdminIndieAuthCreateResponseSchema = S.object(s => ({
@@ -863,8 +863,8 @@ function postAdminIndieAuthDelete(body, fetch) {
 }
 
 let postAdminIndieAuthListRequestSchema = 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 postAdminIndieAuthListResponse_1Schema = S.object(s => ({
@@ -883,8 +883,8 @@ function postAdminIndieAuthList(body, fetch) {
 
 let postAdminIndieAuthUpdateRequestSchema = S.object(s => ({
   id: s.f("id", S.min(S.string, 1, undefined)),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  redirectUris: s.fieldOr("redirectUris", S.nullableAsOption(S.array(S.string)), undefined)
+  name: s.f("name", S.option(S.string)),
+  redirectUris: s.f("redirectUris", S.option(S.array(S.string)))
 }));
 
 function postAdminIndieAuthUpdate(body, fetch) {
@@ -893,8 +893,8 @@ function postAdminIndieAuthUpdate(body, fetch) {
 }
 
 let postAdminInviteCreateRequestSchema = S.object(s => ({
-  count: s.fieldOr("count", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  expiresAt: s.fieldOr("expiresAt", S.nullableAsOption(S.string), undefined)
+  count: s.f("count", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  expiresAt: s.f("expiresAt", S.option(S.string))
 }));
 
 let postAdminInviteCreateResponseSchema = S.array(MisskeyIoComponentSchemas.InviteCode.schema);
@@ -905,10 +905,10 @@ function postAdminInviteCreate(body, fetch) {
 }
 
 let postAdminInviteListRequestSchema = 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),
-  type: s.fieldOr("type", S.nullableAsOption(S.string), undefined),
-  sort: s.fieldOr("sort", S.nullableAsOption(S.string), 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)),
+  type: s.f("type", S.option(S.string)),
+  sort: s.f("sort", S.option(S.string))
 }));
 
 let postAdminInviteListResponseSchema = S.array(MisskeyIoComponentSchemas.InviteCode.schema);
@@ -1030,8 +1030,8 @@ function postAdminResetPassword(body, fetch) {
 
 let postAdminResolveAbuseUserReportRequestSchema = S.object(s => ({
   reportId: s.f("reportId", S.string),
-  resolvedAs: s.fieldOr("resolvedAs", S.nullableAsOption(S.string), undefined),
-  forward: s.fieldOr("forward", S.nullableAsOption(S.bool), undefined)
+  resolvedAs: s.f("resolvedAs", S.option(S.string)),
+  forward: s.f("forward", S.option(S.bool))
 }));
 
 function postAdminResolveAbuseUserReport(body, fetch) {
@@ -1042,8 +1042,8 @@ function postAdminResolveAbuseUserReport(body, fetch) {
 let postAdminRolesAssignRequestSchema = S.object(s => ({
   roleId: s.f("roleId", S.string),
   userId: s.f("userId", S.string),
-  memo: s.fieldOr("memo", S.nullableAsOption(S.string), undefined),
-  expiresAt: s.fieldOr("expiresAt", S.nullableAsOption(S.int), undefined)
+  memo: s.f("memo", S.option(S.string)),
+  expiresAt: s.f("expiresAt", S.option(S.int))
 }));
 
 function postAdminRolesAssign(body, fetch) {
@@ -1061,10 +1061,10 @@ let postAdminRolesCreateRequestSchema = S.object(s => ({
   isPublic: s.f("isPublic", S.bool),
   isModerator: s.f("isModerator", S.bool),
   isAdministrator: s.f("isAdministrator", S.bool),
-  isExplorable: s.fieldOr("isExplorable", S.nullableAsOption(S.bool), undefined),
+  isExplorable: s.f("isExplorable", S.option(S.bool)),
   asBadge: s.f("asBadge", S.bool),
-  badgeBehavior: s.fieldOr("badgeBehavior", S.nullableAsOption(S.string), undefined),
-  preserveAssignmentOnMoveAccount: s.fieldOr("preserveAssignmentOnMoveAccount", S.nullableAsOption(S.bool), undefined),
+  badgeBehavior: s.f("badgeBehavior", S.option(S.string)),
+  preserveAssignmentOnMoveAccount: s.f("preserveAssignmentOnMoveAccount", S.option(S.bool)),
   canEditMembersByModerator: s.f("canEditMembersByModerator", S.bool),
   displayOrder: s.f("displayOrder", S.float),
   policies: s.f("policies", S.dict(S.json))
@@ -1115,21 +1115,21 @@ function postAdminRolesUnassign(body, fetch) {
 
 let postAdminRolesUpdateRequestSchema = S.object(s => ({
   roleId: s.f("roleId", S.string),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  description: s.fieldOr("description", S.nullableAsOption(S.string), undefined),
-  color: s.fieldOr("color", S.nullableAsOption(S.string), undefined),
-  iconUrl: s.fieldOr("iconUrl", S.nullableAsOption(S.string), undefined),
-  target: s.fieldOr("target", S.nullableAsOption(S.string), undefined),
+  name: s.f("name", S.option(S.string)),
+  description: s.f("description", S.option(S.string)),
+  color: s.f("color", S.option(S.string)),
+  iconUrl: s.f("iconUrl", S.option(S.string)),
+  target: s.f("target", S.option(S.string)),
   condFormula: s.f("condFormula", S.option(S.dict(S.json))),
-  isPublic: s.fieldOr("isPublic", S.nullableAsOption(S.bool), undefined),
-  isModerator: s.fieldOr("isModerator", S.nullableAsOption(S.bool), undefined),
-  isAdministrator: s.fieldOr("isAdministrator", S.nullableAsOption(S.bool), undefined),
-  isExplorable: s.fieldOr("isExplorable", S.nullableAsOption(S.bool), undefined),
-  asBadge: s.fieldOr("asBadge", S.nullableAsOption(S.bool), undefined),
-  badgeBehavior: s.fieldOr("badgeBehavior", S.nullableAsOption(S.string), undefined),
-  preserveAssignmentOnMoveAccount: s.fieldOr("preserveAssignmentOnMoveAccount", S.nullableAsOption(S.bool), undefined),
-  canEditMembersByModerator: s.fieldOr("canEditMembersByModerator", S.nullableAsOption(S.bool), undefined),
-  displayOrder: s.fieldOr("displayOrder", S.nullableAsOption(S.float), undefined),
+  isPublic: s.f("isPublic", S.option(S.bool)),
+  isModerator: s.f("isModerator", S.option(S.bool)),
+  isAdministrator: s.f("isAdministrator", S.option(S.bool)),
+  isExplorable: s.f("isExplorable", S.option(S.bool)),
+  asBadge: s.f("asBadge", S.option(S.bool)),
+  badgeBehavior: s.f("badgeBehavior", S.option(S.string)),
+  preserveAssignmentOnMoveAccount: s.f("preserveAssignmentOnMoveAccount", S.option(S.bool)),
+  canEditMembersByModerator: s.f("canEditMembersByModerator", S.option(S.bool)),
+  displayOrder: s.f("displayOrder", S.option(S.float)),
   policies: s.f("policies", S.option(S.dict(S.json)))
 }));
 
@@ -1154,15 +1154,15 @@ let postAdminRolesUpdateInlinePoliciesRequest_2Schema = S.union([
 ]);
 
 let postAdminRolesUpdateInlinePoliciesRequest_1Schema = S.object(s => ({
-  id: s.fieldOr("id", S.nullableAsOption(S.string), undefined),
+  id: s.f("id", S.option(S.string)),
   policy: s.f("policy", S.string),
-  operation: s.fieldOr("operation", S.nullableAsOption(S.string), undefined),
-  value: s.fieldOr("value", S.nullableAsOption(S.union([
+  operation: s.f("operation", S.option(S.string)),
+  value: s.f("value", S.option(S.union([
     S.shape(S.bool, v => (v)),
     S.shape(S.float, v => (v)),
     S.shape(S.string, v => (v))
-  ])), undefined),
-  memo: s.fieldOr("memo", S.nullableAsOption(S.string), undefined)
+  ]))),
+  memo: s.f("memo", S.option(S.string))
 }));
 
 let postAdminRolesUpdateInlinePoliciesRequestSchema = S.object(s => ({
@@ -1177,9 +1177,9 @@ function postAdminRolesUpdateInlinePolicies(body, fetch) {
 
 let postAdminRolesUsersRequestSchema = 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 postAdminRolesUsersResponse_1Schema = S.object(s => ({
@@ -1209,11 +1209,11 @@ function postAdminSendEmail(body, fetch) {
 }
 
 let postAdminShowModerationLogsRequestSchema = 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),
-  type: s.fieldOr("type", S.nullableAsOption(S.string), undefined),
-  userId: s.fieldOr("userId", 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)),
+  type: s.f("type", S.option(S.string)),
+  userId: s.f("userId", S.option(S.string))
 }));
 
 let postAdminShowModerationLogsResponse_1Schema = S.object(s => ({
@@ -1317,13 +1317,13 @@ function postAdminShowUser(body, fetch) {
 }
 
 let postAdminShowUserAccountMoveLogsRequestSchema = 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),
-  movedFromId: s.fieldOr("movedFromId", S.nullableAsOption(S.string), undefined),
-  movedToId: s.fieldOr("movedToId", S.nullableAsOption(S.string), undefined),
-  from: s.fieldOr("from", S.nullableAsOption(S.string), undefined),
-  to: s.fieldOr("to", 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)),
+  movedFromId: s.f("movedFromId", S.option(S.string)),
+  movedToId: s.f("movedToId", S.option(S.string)),
+  from: s.f("from", S.option(S.string)),
+  to: s.f("to", S.option(S.string))
 }));
 
 let postAdminShowUserAccountMoveLogsResponse_1Schema = S.object(s => ({
@@ -1343,13 +1343,13 @@ function postAdminShowUserAccountMoveLogs(body, fetch) {
 }
 
 let postAdminShowUsersRequestSchema = 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),
-  sort: s.fieldOr("sort", S.nullableAsOption(S.string), undefined),
-  state: s.fieldOr("state", S.nullableAsOption(S.string), undefined),
-  origin: s.fieldOr("origin", S.nullableAsOption(S.string), undefined),
-  username: s.fieldOr("username", S.nullableAsOption(S.string), undefined),
-  hostname: s.fieldOr("hostname", S.nullableAsOption(S.string), 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)),
+  sort: s.f("sort", S.option(S.string)),
+  state: s.f("state", S.option(S.string)),
+  origin: s.f("origin", S.option(S.string)),
+  username: s.f("username", S.option(S.string)),
+  hostname: s.f("hostname", S.option(S.string))
 }));
 
 let postAdminShowUsersResponseSchema = S.array(MisskeyIoComponentSchemas.UserDetailed.schema);
@@ -1360,19 +1360,19 @@ function postAdminShowUsers(body, fetch) {
 }
 
 let postAdminSsoCreateRequestSchema = S.object(s => ({
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
+  name: s.f("name", S.option(S.string)),
   type: s.f("type", S.string),
   issuer: s.f("issuer", S.string),
-  audience: s.fieldOr("audience", S.nullableAsOption(S.array(S.string)), undefined),
-  binding: s.fieldOr("binding", S.nullableAsOption(S.string), undefined),
+  audience: s.f("audience", S.option(S.array(S.string))),
+  binding: s.f("binding", S.option(S.string)),
   acsUrl: s.f("acsUrl", S.string),
   signatureAlgorithm: s.f("signatureAlgorithm", S.string),
-  cipherAlgorithm: s.fieldOr("cipherAlgorithm", S.nullableAsOption(S.string), undefined),
-  wantAuthnRequestsSigned: s.fieldOr("wantAuthnRequestsSigned", S.nullableAsOption(S.bool), undefined),
-  wantAssertionsSigned: s.fieldOr("wantAssertionsSigned", S.nullableAsOption(S.bool), undefined),
-  wantEmailAddressNormalized: s.fieldOr("wantEmailAddressNormalized", S.nullableAsOption(S.bool), undefined),
+  cipherAlgorithm: s.f("cipherAlgorithm", S.option(S.string)),
+  wantAuthnRequestsSigned: s.f("wantAuthnRequestsSigned", S.option(S.bool)),
+  wantAssertionsSigned: s.f("wantAssertionsSigned", S.option(S.bool)),
+  wantEmailAddressNormalized: s.f("wantEmailAddressNormalized", S.option(S.bool)),
   useCertificate: s.f("useCertificate", S.bool),
-  secret: s.fieldOr("secret", S.nullableAsOption(S.string), undefined)
+  secret: s.f("secret", S.option(S.string))
 }));
 
 let postAdminSsoCreateResponseSchema = S.object(s => ({
@@ -1386,7 +1386,7 @@ let postAdminSsoCreateResponseSchema = S.object(s => ({
   acsUrl: s.f("acsUrl", S.string),
   publicKey: s.f("publicKey", S.string),
   signatureAlgorithm: s.f("signatureAlgorithm", S.string),
-  cipherAlgorithm: s.fieldOr("cipherAlgorithm", S.nullableAsOption(S.string), undefined),
+  cipherAlgorithm: s.f("cipherAlgorithm", S.option(S.string)),
   wantAuthnRequestsSigned: s.f("wantAuthnRequestsSigned", S.bool),
   wantAssertionsSigned: s.f("wantAssertionsSigned", S.bool),
   wantEmailAddressNormalized: s.f("wantEmailAddressNormalized", S.bool)
@@ -1407,8 +1407,8 @@ function postAdminSsoDelete(body, fetch) {
 }
 
 let postAdminSsoListRequestSchema = 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 postAdminSsoListResponse_1Schema = S.object(s => ({
@@ -1423,7 +1423,7 @@ let postAdminSsoListResponse_1Schema = S.object(s => ({
   useCertificate: s.f("useCertificate", S.bool),
   publicKey: s.f("publicKey", S.string),
   signatureAlgorithm: s.f("signatureAlgorithm", S.string),
-  cipherAlgorithm: s.fieldOr("cipherAlgorithm", S.nullableAsOption(S.string), undefined),
+  cipherAlgorithm: s.f("cipherAlgorithm", S.option(S.string)),
   wantAuthnRequestsSigned: s.f("wantAuthnRequestsSigned", S.bool),
   wantAssertionsSigned: s.f("wantAssertionsSigned", S.bool),
   wantEmailAddressNormalized: s.f("wantEmailAddressNormalized", S.bool)
@@ -1438,18 +1438,18 @@ function postAdminSsoList(body, fetch) {
 
 let postAdminSsoUpdateRequestSchema = S.object(s => ({
   id: s.f("id", S.string),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  issuer: s.fieldOr("issuer", S.nullableAsOption(S.string), undefined),
-  audience: s.fieldOr("audience", S.nullableAsOption(S.array(S.string)), undefined),
-  binding: s.fieldOr("binding", S.nullableAsOption(S.string), undefined),
-  acsUrl: s.fieldOr("acsUrl", S.nullableAsOption(S.string), undefined),
-  signatureAlgorithm: s.fieldOr("signatureAlgorithm", S.nullableAsOption(S.string), undefined),
-  cipherAlgorithm: s.fieldOr("cipherAlgorithm", S.nullableAsOption(S.string), undefined),
-  wantAuthnRequestsSigned: s.fieldOr("wantAuthnRequestsSigned", S.nullableAsOption(S.bool), undefined),
-  wantAssertionsSigned: s.fieldOr("wantAssertionsSigned", S.nullableAsOption(S.bool), undefined),
-  wantEmailAddressNormalized: s.fieldOr("wantEmailAddressNormalized", S.nullableAsOption(S.bool), undefined),
-  regenerateCertificate: s.fieldOr("regenerateCertificate", S.nullableAsOption(S.bool), undefined),
-  secret: s.fieldOr("secret", S.nullableAsOption(S.string), undefined)
+  name: s.f("name", S.option(S.string)),
+  issuer: s.f("issuer", S.option(S.string)),
+  audience: s.f("audience", S.option(S.array(S.string))),
+  binding: s.f("binding", S.option(S.string)),
+  acsUrl: s.f("acsUrl", S.option(S.string)),
+  signatureAlgorithm: s.f("signatureAlgorithm", S.option(S.string)),
+  cipherAlgorithm: s.f("cipherAlgorithm", S.option(S.string)),
+  wantAuthnRequestsSigned: s.f("wantAuthnRequestsSigned", S.option(S.bool)),
+  wantAssertionsSigned: s.f("wantAssertionsSigned", S.option(S.bool)),
+  wantEmailAddressNormalized: s.f("wantEmailAddressNormalized", S.option(S.bool)),
+  regenerateCertificate: s.f("regenerateCertificate", S.option(S.bool)),
+  secret: s.f("secret", S.option(S.string))
 }));
 
 function postAdminSsoUpdate(body, fetch) {
@@ -1491,8 +1491,8 @@ function postAdminSystemWebhookDelete(body, fetch) {
 }
 
 let postAdminSystemWebhookListRequestSchema = S.object(s => ({
-  isActive: s.fieldOr("isActive", S.nullableAsOption(S.bool), undefined),
-  on: s.fieldOr("on", S.nullableAsOption(S.array(S.string)), undefined)
+  isActive: s.f("isActive", S.option(S.bool)),
+  on: s.f("on", S.option(S.array(S.string)))
 }));
 
 let postAdminSystemWebhookListResponseSchema = S.array(MisskeyIoComponentSchemas.SystemWebhook.schema);
@@ -1568,7 +1568,7 @@ function postAdminUnsuspendUser(body, fetch) {
 
 let postAdminUpdateAbuseUserReportRequestSchema = S.object(s => ({
   reportId: s.f("reportId", S.string),
-  moderationNote: s.fieldOr("moderationNote", S.nullableAsOption(S.string), undefined)
+  moderationNote: s.f("moderationNote", S.option(S.string))
 }));
 
 function postAdminUpdateAbuseUserReport(body, fetch) {
@@ -1577,121 +1577,121 @@ function postAdminUpdateAbuseUserReport(body, fetch) {
 }
 
 let postAdminUpdateMetaRequestSchema = S.object(s => ({
-  disableRegistration: s.fieldOr("disableRegistration", S.nullableAsOption(S.bool), undefined),
-  pinnedUsers: s.fieldOr("pinnedUsers", S.nullableAsOption(S.json), undefined),
-  hiddenTags: s.fieldOr("hiddenTags", S.nullableAsOption(S.json), undefined),
-  blockedHosts: s.fieldOr("blockedHosts", S.nullableAsOption(S.json), undefined),
-  sensitiveWords: s.fieldOr("sensitiveWords", S.nullableAsOption(S.json), undefined),
-  blockedRemoteCustomEmojis: s.fieldOr("blockedRemoteCustomEmojis", S.nullableAsOption(S.json), undefined),
-  prohibitedWords: s.fieldOr("prohibitedWords", S.nullableAsOption(S.json), undefined),
-  themeColor: s.fieldOr("themeColor", S.nullableAsOption(S.pattern(S.string, /^#[0-9a-fA-F]{6}$/, undefined)), undefined),
-  mascotImageUrl: s.fieldOr("mascotImageUrl", S.nullableAsOption(S.string), undefined),
-  bannerUrl: s.fieldOr("bannerUrl", S.nullableAsOption(S.string), undefined),
-  serverErrorImageUrl: s.fieldOr("serverErrorImageUrl", S.nullableAsOption(S.string), undefined),
-  infoImageUrl: s.fieldOr("infoImageUrl", S.nullableAsOption(S.string), undefined),
-  notFoundImageUrl: s.fieldOr("notFoundImageUrl", S.nullableAsOption(S.string), undefined),
-  iconUrl: s.fieldOr("iconUrl", S.nullableAsOption(S.string), undefined),
-  app192IconUrl: s.fieldOr("app192IconUrl", S.nullableAsOption(S.string), undefined),
-  app512IconUrl: s.fieldOr("app512IconUrl", S.nullableAsOption(S.string), undefined),
-  backgroundImageUrl: s.fieldOr("backgroundImageUrl", S.nullableAsOption(S.string), undefined),
-  logoImageUrl: s.fieldOr("logoImageUrl", S.nullableAsOption(S.string), undefined),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  shortName: s.fieldOr("shortName", S.nullableAsOption(S.string), undefined),
-  description: s.fieldOr("description", S.nullableAsOption(S.string), undefined),
-  defaultLightTheme: s.fieldOr("defaultLightTheme", S.nullableAsOption(S.string), undefined),
-  defaultDarkTheme: s.fieldOr("defaultDarkTheme", S.nullableAsOption(S.string), undefined),
-  cacheRemoteFiles: s.fieldOr("cacheRemoteFiles", S.nullableAsOption(S.bool), undefined),
-  cacheRemoteSensitiveFiles: s.fieldOr("cacheRemoteSensitiveFiles", S.nullableAsOption(S.bool), undefined),
-  emailRequiredForSignup: s.fieldOr("emailRequiredForSignup", S.nullableAsOption(S.bool), undefined),
-  enableHcaptcha: s.fieldOr("enableHcaptcha", S.nullableAsOption(S.bool), undefined),
-  hcaptchaSiteKey: s.fieldOr("hcaptchaSiteKey", S.nullableAsOption(S.string), undefined),
-  hcaptchaSecretKey: s.fieldOr("hcaptchaSecretKey", S.nullableAsOption(S.string), undefined),
-  enableMcaptcha: s.fieldOr("enableMcaptcha", S.nullableAsOption(S.bool), undefined),
-  mcaptchaSiteKey: s.fieldOr("mcaptchaSiteKey", S.nullableAsOption(S.string), undefined),
-  mcaptchaInstanceUrl: s.fieldOr("mcaptchaInstanceUrl", S.nullableAsOption(S.string), undefined),
-  mcaptchaSecretKey: s.fieldOr("mcaptchaSecretKey", S.nullableAsOption(S.string), undefined),
-  enableRecaptcha: s.fieldOr("enableRecaptcha", S.nullableAsOption(S.bool), undefined),
-  recaptchaSiteKey: s.fieldOr("recaptchaSiteKey", S.nullableAsOption(S.string), undefined),
-  recaptchaSecretKey: s.fieldOr("recaptchaSecretKey", S.nullableAsOption(S.string), undefined),
-  enableTurnstile: s.fieldOr("enableTurnstile", S.nullableAsOption(S.bool), undefined),
-  turnstileSiteKey: s.fieldOr("turnstileSiteKey", S.nullableAsOption(S.string), undefined),
-  turnstileSecretKey: s.fieldOr("turnstileSecretKey", S.nullableAsOption(S.string), undefined),
-  googleAnalyticsId: s.fieldOr("googleAnalyticsId", S.nullableAsOption(S.string), undefined),
-  sensitiveMediaDetection: s.fieldOr("sensitiveMediaDetection", S.nullableAsOption(S.string), undefined),
-  sensitiveMediaDetectionSensitivity: s.fieldOr("sensitiveMediaDetectionSensitivity", S.nullableAsOption(S.string), undefined),
-  setSensitiveFlagAutomatically: s.fieldOr("setSensitiveFlagAutomatically", S.nullableAsOption(S.bool), undefined),
-  enableSensitiveMediaDetectionForVideos: s.fieldOr("enableSensitiveMediaDetectionForVideos", S.nullableAsOption(S.bool), undefined),
-  maintainerName: s.fieldOr("maintainerName", S.nullableAsOption(S.string), undefined),
-  maintainerEmail: s.fieldOr("maintainerEmail", S.nullableAsOption(S.string), undefined),
-  langs: s.fieldOr("langs", S.nullableAsOption(S.array(S.string)), undefined),
-  dimensions: s.fieldOr("dimensions", S.nullableAsOption(S.min(S.int, 1, undefined)), undefined),
-  deeplAuthKey: s.fieldOr("deeplAuthKey", S.nullableAsOption(S.string), undefined),
-  deeplIsPro: s.fieldOr("deeplIsPro", S.nullableAsOption(S.bool), undefined),
-  enableEmail: s.fieldOr("enableEmail", S.nullableAsOption(S.bool), undefined),
-  email: s.fieldOr("email", S.nullableAsOption(S.string), undefined),
-  smtpSecure: s.fieldOr("smtpSecure", S.nullableAsOption(S.bool), undefined),
-  smtpHost: s.fieldOr("smtpHost", S.nullableAsOption(S.string), undefined),
-  smtpPort: s.fieldOr("smtpPort", S.nullableAsOption(S.int), undefined),
-  smtpUser: s.fieldOr("smtpUser", S.nullableAsOption(S.string), undefined),
-  smtpPass: s.fieldOr("smtpPass", S.nullableAsOption(S.string), undefined),
-  enableServiceWorker: s.fieldOr("enableServiceWorker", S.nullableAsOption(S.bool), undefined),
-  swPublicKey: s.fieldOr("swPublicKey", S.nullableAsOption(S.string), undefined),
-  swPrivateKey: s.fieldOr("swPrivateKey", S.nullableAsOption(S.string), undefined),
-  tosUrl: s.fieldOr("tosUrl", S.nullableAsOption(S.string), undefined),
-  repositoryUrl: s.fieldOr("repositoryUrl", S.nullableAsOption(S.string), undefined),
-  feedbackUrl: s.fieldOr("feedbackUrl", S.nullableAsOption(S.string), undefined),
-  impressumUrl: s.fieldOr("impressumUrl", S.nullableAsOption(S.string), undefined),
-  privacyPolicyUrl: s.fieldOr("privacyPolicyUrl", S.nullableAsOption(S.string), undefined),
-  useObjectStorage: s.fieldOr("useObjectStorage", S.nullableAsOption(S.bool), undefined),
-  objectStorageBaseUrl: s.fieldOr("objectStorageBaseUrl", S.nullableAsOption(S.string), undefined),
-  objectStorageBucket: s.fieldOr("objectStorageBucket", S.nullableAsOption(S.string), undefined),
-  objectStoragePrefix: s.fieldOr("objectStoragePrefix", S.nullableAsOption(S.pattern(S.string, /^[a-zA-Z0-9._-]*$/, undefined)), undefined),
-  objectStorageEndpoint: s.fieldOr("objectStorageEndpoint", S.nullableAsOption(S.string), undefined),
-  objectStorageRegion: s.fieldOr("objectStorageRegion", S.nullableAsOption(S.string), undefined),
-  objectStoragePort: s.fieldOr("objectStoragePort", S.nullableAsOption(S.int), undefined),
-  objectStorageAccessKey: s.fieldOr("objectStorageAccessKey", S.nullableAsOption(S.string), undefined),
-  objectStorageSecretKey: s.fieldOr("objectStorageSecretKey", S.nullableAsOption(S.string), undefined),
-  objectStorageUseSSL: s.fieldOr("objectStorageUseSSL", S.nullableAsOption(S.bool), undefined),
-  objectStorageUseProxy: s.fieldOr("objectStorageUseProxy", S.nullableAsOption(S.bool), undefined),
-  objectStorageSetPublicRead: s.fieldOr("objectStorageSetPublicRead", S.nullableAsOption(S.bool), undefined),
-  objectStorageS3ForcePathStyle: s.fieldOr("objectStorageS3ForcePathStyle", S.nullableAsOption(S.bool), undefined),
-  enableIpLogging: s.fieldOr("enableIpLogging", S.nullableAsOption(S.bool), undefined),
-  enableActiveEmailValidation: s.fieldOr("enableActiveEmailValidation", S.nullableAsOption(S.bool), undefined),
-  enableVerifymailApi: s.fieldOr("enableVerifymailApi", S.nullableAsOption(S.bool), undefined),
-  verifymailAuthKey: s.fieldOr("verifymailAuthKey", S.nullableAsOption(S.string), undefined),
-  enableTruemailApi: s.fieldOr("enableTruemailApi", S.nullableAsOption(S.bool), undefined),
-  truemailInstance: s.fieldOr("truemailInstance", S.nullableAsOption(S.string), undefined),
-  truemailAuthKey: s.fieldOr("truemailAuthKey", S.nullableAsOption(S.string), undefined),
-  enableChartsForRemoteUser: s.fieldOr("enableChartsForRemoteUser", S.nullableAsOption(S.bool), undefined),
-  enableChartsForFederatedInstances: s.fieldOr("enableChartsForFederatedInstances", S.nullableAsOption(S.bool), undefined),
-  enableServerMachineStats: s.fieldOr("enableServerMachineStats", S.nullableAsOption(S.bool), undefined),
-  enableIdenticonGeneration: s.fieldOr("enableIdenticonGeneration", S.nullableAsOption(S.bool), undefined),
-  serverRules: s.fieldOr("serverRules", S.nullableAsOption(S.array(S.string)), undefined),
-  bannedEmailDomains: s.fieldOr("bannedEmailDomains", S.nullableAsOption(S.array(S.string)), undefined),
-  preservedUsernames: s.fieldOr("preservedUsernames", S.nullableAsOption(S.array(S.string)), undefined),
-  manifestJsonOverride: s.fieldOr("manifestJsonOverride", S.nullableAsOption(S.string), undefined),
-  enableFanoutTimeline: s.fieldOr("enableFanoutTimeline", S.nullableAsOption(S.bool), undefined),
-  enableFanoutTimelineDbFallback: s.fieldOr("enableFanoutTimelineDbFallback", S.nullableAsOption(S.bool), undefined),
-  perLocalUserUserTimelineCacheMax: s.fieldOr("perLocalUserUserTimelineCacheMax", S.nullableAsOption(S.int), undefined),
-  perRemoteUserUserTimelineCacheMax: s.fieldOr("perRemoteUserUserTimelineCacheMax", S.nullableAsOption(S.int), undefined),
-  perUserHomeTimelineCacheMax: s.fieldOr("perUserHomeTimelineCacheMax", S.nullableAsOption(S.int), undefined),
-  perUserListTimelineCacheMax: s.fieldOr("perUserListTimelineCacheMax", S.nullableAsOption(S.int), undefined),
-  notesPerOneAd: s.fieldOr("notesPerOneAd", S.nullableAsOption(S.int), undefined),
-  silencedHosts: s.fieldOr("silencedHosts", S.nullableAsOption(S.json), undefined),
-  sensitiveMediaHosts: s.fieldOr("sensitiveMediaHosts", S.nullableAsOption(S.json), undefined),
-  wellKnownWebsites: s.fieldOr("wellKnownWebsites", S.nullableAsOption(S.json), undefined),
-  urlPreviewDenyList: s.fieldOr("urlPreviewDenyList", S.nullableAsOption(S.json), undefined),
-  featuredGameChannels: s.fieldOr("featuredGameChannels", S.nullableAsOption(S.json), undefined),
-  summalyProxy: s.fieldOr("summalyProxy", S.nullableAsOption(S.string), undefined),
-  urlPreviewEnabled: s.fieldOr("urlPreviewEnabled", S.nullableAsOption(S.bool), undefined),
-  urlPreviewTimeout: s.fieldOr("urlPreviewTimeout", S.nullableAsOption(S.int), undefined),
-  urlPreviewMaximumContentLength: s.fieldOr("urlPreviewMaximumContentLength", S.nullableAsOption(S.int), undefined),
-  urlPreviewRequireContentLength: s.fieldOr("urlPreviewRequireContentLength", S.nullableAsOption(S.bool), undefined),
-  urlPreviewUserAgent: s.fieldOr("urlPreviewUserAgent", S.nullableAsOption(S.string), undefined),
-  urlPreviewSummaryProxyUrl: s.fieldOr("urlPreviewSummaryProxyUrl", S.nullableAsOption(S.string), undefined),
-  prohibitedWordsForNameOfUser: s.fieldOr("prohibitedWordsForNameOfUser", S.nullableAsOption(S.json), undefined),
-  federation: s.fieldOr("federation", S.nullableAsOption(S.string), undefined),
-  federationHosts: s.fieldOr("federationHosts", S.nullableAsOption(S.array(S.string)), undefined)
+  disableRegistration: s.f("disableRegistration", S.option(S.bool)),
+  pinnedUsers: s.f("pinnedUsers", S.option(S.json)),
+  hiddenTags: s.f("hiddenTags", S.option(S.json)),
+  blockedHosts: s.f("blockedHosts", S.option(S.json)),
+  sensitiveWords: s.f("sensitiveWords", S.option(S.json)),
+  blockedRemoteCustomEmojis: s.f("blockedRemoteCustomEmojis", S.option(S.json)),
+  prohibitedWords: s.f("prohibitedWords", S.option(S.json)),
+  themeColor: s.f("themeColor", S.option(S.pattern(S.string, /^#[0-9a-fA-F]{6}$/, undefined))),
+  mascotImageUrl: s.f("mascotImageUrl", S.option(S.string)),
+  bannerUrl: s.f("bannerUrl", S.option(S.string)),
+  serverErrorImageUrl: s.f("serverErrorImageUrl", S.option(S.string)),
+  infoImageUrl: s.f("infoImageUrl", S.option(S.string)),
+  notFoundImageUrl: s.f("notFoundImageUrl", S.option(S.string)),
+  iconUrl: s.f("iconUrl", S.option(S.string)),
+  app192IconUrl: s.f("app192IconUrl", S.option(S.string)),
+  app512IconUrl: s.f("app512IconUrl", S.option(S.string)),
+  backgroundImageUrl: s.f("backgroundImageUrl", S.option(S.string)),
+  logoImageUrl: s.f("logoImageUrl", S.option(S.string)),
+  name: s.f("name", S.option(S.string)),
+  shortName: s.f("shortName", S.option(S.string)),
+  description: s.f("description", S.option(S.string)),
+  defaultLightTheme: s.f("defaultLightTheme", S.option(S.string)),
+  defaultDarkTheme: s.f("defaultDarkTheme", S.option(S.string)),
+  cacheRemoteFiles: s.f("cacheRemoteFiles", S.option(S.bool)),
+  cacheRemoteSensitiveFiles: s.f("cacheRemoteSensitiveFiles", S.option(S.bool)),
+  emailRequiredForSignup: s.f("emailRequiredForSignup", S.option(S.bool)),
+  enableHcaptcha: s.f("enableHcaptcha", S.option(S.bool)),
+  hcaptchaSiteKey: s.f("hcaptchaSiteKey", S.option(S.string)),
+  hcaptchaSecretKey: s.f("hcaptchaSecretKey", S.option(S.string)),
+  enableMcaptcha: s.f("enableMcaptcha", S.option(S.bool)),
+  mcaptchaSiteKey: s.f("mcaptchaSiteKey", S.option(S.string)),
+  mcaptchaInstanceUrl: s.f("mcaptchaInstanceUrl", S.option(S.string)),
+  mcaptchaSecretKey: s.f("mcaptchaSecretKey", S.option(S.string)),
+  enableRecaptcha: s.f("enableRecaptcha", S.option(S.bool)),
+  recaptchaSiteKey: s.f("recaptchaSiteKey", S.option(S.string)),
+  recaptchaSecretKey: s.f("recaptchaSecretKey", S.option(S.string)),
+  enableTurnstile: s.f("enableTurnstile", S.option(S.bool)),
+  turnstileSiteKey: s.f("turnstileSiteKey", S.option(S.string)),
+  turnstileSecretKey: s.f("turnstileSecretKey", S.option(S.string)),
+  googleAnalyticsId: s.f("googleAnalyticsId", S.option(S.string)),
+  sensitiveMediaDetection: s.f("sensitiveMediaDetection", S.option(S.string)),
+  sensitiveMediaDetectionSensitivity: s.f("sensitiveMediaDetectionSensitivity", S.option(S.string)),
+  setSensitiveFlagAutomatically: s.f("setSensitiveFlagAutomatically", S.option(S.bool)),
+  enableSensitiveMediaDetectionForVideos: s.f("enableSensitiveMediaDetectionForVideos", S.option(S.bool)),
+  maintainerName: s.f("maintainerName", S.option(S.string)),
+  maintainerEmail: s.f("maintainerEmail", S.option(S.string)),
+  langs: s.f("langs", S.option(S.array(S.string))),
+  dimensions: s.f("dimensions", S.option(S.min(S.int, 1, undefined))),
+  deeplAuthKey: s.f("deeplAuthKey", S.option(S.string)),
+  deeplIsPro: s.f("deeplIsPro", S.option(S.bool)),
+  enableEmail: s.f("enableEmail", S.option(S.bool)),
+  email: s.f("email", S.option(S.string)),
+  smtpSecure: s.f("smtpSecure", S.option(S.bool)),
+  smtpHost: s.f("smtpHost", S.option(S.string)),
+  smtpPort: s.f("smtpPort", S.option(S.int)),
+  smtpUser: s.f("smtpUser", S.option(S.string)),
+  smtpPass: s.f("smtpPass", S.option(S.string)),
+  enableServiceWorker: s.f("enableServiceWorker", S.option(S.bool)),
+  swPublicKey: s.f("swPublicKey", S.option(S.string)),
+  swPrivateKey: s.f("swPrivateKey", S.option(S.string)),
+  tosUrl: s.f("tosUrl", S.option(S.string)),
+  repositoryUrl: s.f("repositoryUrl", S.option(S.string)),
+  feedbackUrl: s.f("feedbackUrl", S.option(S.string)),
+  impressumUrl: s.f("impressumUrl", S.option(S.string)),
+  privacyPolicyUrl: s.f("privacyPolicyUrl", S.option(S.string)),
+  useObjectStorage: s.f("useObjectStorage", S.option(S.bool)),
+  objectStorageBaseUrl: s.f("objectStorageBaseUrl", S.option(S.string)),
+  objectStorageBucket: s.f("objectStorageBucket", S.option(S.string)),
+  objectStoragePrefix: s.f("objectStoragePrefix", S.option(S.pattern(S.string, /^[a-zA-Z0-9._-]*$/, undefined))),
+  objectStorageEndpoint: s.f("objectStorageEndpoint", S.option(S.string)),
+  objectStorageRegion: s.f("objectStorageRegion", S.option(S.string)),
+  objectStoragePort: s.f("objectStoragePort", S.option(S.int)),
+  objectStorageAccessKey: s.f("objectStorageAccessKey", S.option(S.string)),
+  objectStorageSecretKey: s.f("objectStorageSecretKey", S.option(S.string)),
+  objectStorageUseSSL: s.f("objectStorageUseSSL", S.option(S.bool)),
+  objectStorageUseProxy: s.f("objectStorageUseProxy", S.option(S.bool)),
+  objectStorageSetPublicRead: s.f("objectStorageSetPublicRead", S.option(S.bool)),
+  objectStorageS3ForcePathStyle: s.f("objectStorageS3ForcePathStyle", S.option(S.bool)),
+  enableIpLogging: s.f("enableIpLogging", S.option(S.bool)),
+  enableActiveEmailValidation: s.f("enableActiveEmailValidation", S.option(S.bool)),
+  enableVerifymailApi: s.f("enableVerifymailApi", S.option(S.bool)),
+  verifymailAuthKey: s.f("verifymailAuthKey", S.option(S.string)),
+  enableTruemailApi: s.f("enableTruemailApi", S.option(S.bool)),
+  truemailInstance: s.f("truemailInstance", S.option(S.string)),
+  truemailAuthKey: s.f("truemailAuthKey", S.option(S.string)),
+  enableChartsForRemoteUser: s.f("enableChartsForRemoteUser", S.option(S.bool)),
+  enableChartsForFederatedInstances: s.f("enableChartsForFederatedInstances", S.option(S.bool)),
+  enableServerMachineStats: s.f("enableServerMachineStats", S.option(S.bool)),
+  enableIdenticonGeneration: s.f("enableIdenticonGeneration", S.option(S.bool)),
+  serverRules: s.f("serverRules", S.option(S.array(S.string))),
+  bannedEmailDomains: s.f("bannedEmailDomains", S.option(S.array(S.string))),
+  preservedUsernames: s.f("preservedUsernames", S.option(S.array(S.string))),
+  manifestJsonOverride: s.f("manifestJsonOverride", S.option(S.string)),
+  enableFanoutTimeline: s.f("enableFanoutTimeline", S.option(S.bool)),
+  enableFanoutTimelineDbFallback: s.f("enableFanoutTimelineDbFallback", S.option(S.bool)),
+  perLocalUserUserTimelineCacheMax: s.f("perLocalUserUserTimelineCacheMax", S.option(S.int)),
+  perRemoteUserUserTimelineCacheMax: s.f("perRemoteUserUserTimelineCacheMax", S.option(S.int)),
+  perUserHomeTimelineCacheMax: s.f("perUserHomeTimelineCacheMax", S.option(S.int)),
+  perUserListTimelineCacheMax: s.f("perUserListTimelineCacheMax", S.option(S.int)),
+  notesPerOneAd: s.f("notesPerOneAd", S.option(S.int)),
+  silencedHosts: s.f("silencedHosts", S.option(S.json)),
+  sensitiveMediaHosts: s.f("sensitiveMediaHosts", S.option(S.json)),
+  wellKnownWebsites: s.f("wellKnownWebsites", S.option(S.json)),
+  urlPreviewDenyList: s.f("urlPreviewDenyList", S.option(S.json)),
+  featuredGameChannels: s.f("featuredGameChannels", S.option(S.json)),
+  summalyProxy: s.f("summalyProxy", S.option(S.string)),
+  urlPreviewEnabled: s.f("urlPreviewEnabled", S.option(S.bool)),
+  urlPreviewTimeout: s.f("urlPreviewTimeout", S.option(S.int)),
+  urlPreviewMaximumContentLength: s.f("urlPreviewMaximumContentLength", S.option(S.int)),
+  urlPreviewRequireContentLength: s.f("urlPreviewRequireContentLength", S.option(S.bool)),
+  urlPreviewUserAgent: s.f("urlPreviewUserAgent", S.option(S.string)),
+  urlPreviewSummaryProxyUrl: s.f("urlPreviewSummaryProxyUrl", S.option(S.string)),
+  prohibitedWordsForNameOfUser: s.f("prohibitedWordsForNameOfUser", S.option(S.json)),
+  federation: s.f("federation", S.option(S.string)),
+  federationHosts: s.f("federationHosts", S.option(S.array(S.string)))
 }));
 
 function postAdminUpdateMeta(body, fetch) {
@@ -1700,7 +1700,7 @@ function postAdminUpdateMeta(body, fetch) {
 }
 
 let postAdminUpdateProxyAccountRequestSchema = S.object(s => ({
-  description: s.fieldOr("description", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 1500, undefined)), undefined)
+  description: s.f("description", S.option(S.max(S.min(S.string, 1, undefined), 1500, undefined)))
 }));
 
 let postAdminUpdateProxyAccountResponseSchema = MisskeyIoComponentSchemas.UserDetailed.schema;
@@ -1712,7 +1712,7 @@ function postAdminUpdateProxyAccount(body, fetch) {
 
 let postAdminUpdateUserNameRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined)
+  name: s.f("name", S.option(S.string))
 }));
 
 function postAdminUpdateUserName(body, fetch) {
@@ -1731,30 +1731,30 @@ function postAdminUpdateUserNote(body, fetch) {
 }
 
 let postV2AdminEmojiListRequest_1Schema = S.object(s => ({
-  updatedAtFrom: s.fieldOr("updatedAtFrom", S.nullableAsOption(S.string), undefined),
-  updatedAtTo: s.fieldOr("updatedAtTo", S.nullableAsOption(S.string), undefined),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  host: s.fieldOr("host", S.nullableAsOption(S.string), undefined),
-  uri: s.fieldOr("uri", S.nullableAsOption(S.string), undefined),
-  publicUrl: s.fieldOr("publicUrl", S.nullableAsOption(S.string), undefined),
-  originalUrl: s.fieldOr("originalUrl", S.nullableAsOption(S.string), undefined),
-  type: s.fieldOr("type", S.nullableAsOption(S.string), undefined),
-  aliases: s.fieldOr("aliases", S.nullableAsOption(S.string), undefined),
-  category: s.fieldOr("category", S.nullableAsOption(S.string), undefined),
-  license: s.fieldOr("license", S.nullableAsOption(S.string), undefined),
-  isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), undefined),
-  localOnly: s.fieldOr("localOnly", S.nullableAsOption(S.bool), undefined),
-  hostType: s.fieldOr("hostType", S.nullableAsOption(S.string), undefined),
-  roleIds: s.fieldOr("roleIds", S.nullableAsOption(S.array(S.string)), undefined)
+  updatedAtFrom: s.f("updatedAtFrom", S.option(S.string)),
+  updatedAtTo: s.f("updatedAtTo", S.option(S.string)),
+  name: s.f("name", S.option(S.string)),
+  host: s.f("host", S.option(S.string)),
+  uri: s.f("uri", S.option(S.string)),
+  publicUrl: s.f("publicUrl", S.option(S.string)),
+  originalUrl: s.f("originalUrl", S.option(S.string)),
+  type: s.f("type", S.option(S.string)),
+  aliases: s.f("aliases", S.option(S.string)),
+  category: s.f("category", S.option(S.string)),
+  license: s.f("license", S.option(S.string)),
+  isSensitive: s.f("isSensitive", S.option(S.bool)),
+  localOnly: s.f("localOnly", S.option(S.bool)),
+  hostType: s.f("hostType", S.option(S.string)),
+  roleIds: s.f("roleIds", S.option(S.array(S.string)))
 }));
 
 let postV2AdminEmojiListRequestSchema = S.object(s => ({
-  query: s.fieldOr("query", S.nullableAsOption(postV2AdminEmojiListRequest_1Schema), 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),
-  page: s.fieldOr("page", S.nullableAsOption(S.int), undefined),
-  sortKeys: s.fieldOr("sortKeys", S.nullableAsOption(S.array(S.string)), undefined)
+  query: s.f("query", S.option(postV2AdminEmojiListRequest_1Schema)),
+  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))),
+  page: s.f("page", S.option(S.int)),
+  sortKeys: s.f("sortKeys", S.option(S.array(S.string)))
 }));
 
 let postV2AdminEmojiListResponseSchema = S.object(s => ({