@f3liz/rescript-misskey-api 0.6.4 → 0.6.6

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

@@ -7,7 +7,7 @@ S.enableJson();
 
 let postFollowingCreateRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), undefined)
+  withReplies: s.f("withReplies", S.option(S.bool))
 }));
 
 let postFollowingCreateResponseSchema = MisskeyIoComponentSchemas.UserLite.schema;
@@ -60,9 +60,9 @@ function postFollowingRequestsCancel(body, fetch) {
 }
 
 let postFollowingRequestsListRequestSchema = S.object(s => ({
-  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 postFollowingRequestsListResponse_1Schema = S.object(s => ({
@@ -88,9 +88,9 @@ function postFollowingRequestsReject(body, fetch) {
 }
 
 let postFollowingRequestsSentRequestSchema = S.object(s => ({
-  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 postFollowingRequestsSentResponse_1Schema = S.object(s => ({
@@ -108,8 +108,8 @@ function postFollowingRequestsSent(body, fetch) {
 
 let postFollowingUpdateRequestSchema = S.object(s => ({
   userId: s.f("userId", S.string),
-  notify: s.fieldOr("notify", S.nullableAsOption(S.string), undefined),
-  withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), undefined)
+  notify: s.f("notify", S.option(S.string)),
+  withReplies: s.f("withReplies", S.option(S.bool))
 }));
 
 let postFollowingUpdateResponseSchema = MisskeyIoComponentSchemas.UserLite.schema;
@@ -120,8 +120,8 @@ function postFollowingUpdate(body, fetch) {
 }
 
 let postFollowingUpdateAllRequestSchema = S.object(s => ({
-  notify: s.fieldOr("notify", S.nullableAsOption(S.string), undefined),
-  withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), undefined)
+  notify: s.f("notify", S.option(S.string)),
+  withReplies: s.f("withReplies", S.option(S.bool))
 }));
 
 function postFollowingUpdateAll(body, fetch) {

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

@@ -6,8 +6,8 @@ import * as MisskeyIoComponentSchemas from "./MisskeyIoComponentSchemas.mjs";
 S.enableJson();
 
 let postGalleryFeaturedRequestSchema = 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))
 }));
 
 let postGalleryFeaturedResponseSchema = S.array(MisskeyIoComponentSchemas.GalleryPost.schema);
@@ -24,9 +24,9 @@ function postGalleryPopular(fetch) {
 }
 
 let postGalleryPostsRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postGalleryPostsResponseSchema = S.array(MisskeyIoComponentSchemas.GalleryPost.schema);
@@ -38,9 +38,9 @@ function postGalleryPosts(body, fetch) {
 
 let postGalleryPostsCreateRequestSchema = S.object(s => ({
   title: s.f("title", S.min(S.string, 1, undefined)),
-  description: s.fieldOr("description", S.nullableAsOption(S.string), undefined),
+  description: s.f("description", S.option(S.string)),
   fileIds: s.f("fileIds", S.array(S.string)),
-  isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), undefined)
+  isSensitive: s.f("isSensitive", S.option(S.bool))
 }));
 
 let postGalleryPostsCreateResponseSchema = MisskeyIoComponentSchemas.GalleryPost.schema;
@@ -90,10 +90,10 @@ function postGalleryPostsUnlike(body, fetch) {
 
 let postGalleryPostsUpdateRequestSchema = S.object(s => ({
   postId: s.f("postId", S.string),
-  title: s.fieldOr("title", S.nullableAsOption(S.min(S.string, 1, undefined)), undefined),
-  description: s.fieldOr("description", S.nullableAsOption(S.string), undefined),
-  fileIds: s.fieldOr("fileIds", S.nullableAsOption(S.array(S.string)), undefined),
-  isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), undefined)
+  title: s.f("title", S.option(S.min(S.string, 1, undefined))),
+  description: s.f("description", S.option(S.string)),
+  fileIds: s.f("fileIds", S.option(S.array(S.string))),
+  isSensitive: s.f("isSensitive", S.option(S.bool))
 }));
 
 let postGalleryPostsUpdateResponseSchema = MisskeyIoComponentSchemas.GalleryPost.schema;

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

@@ -6,10 +6,10 @@ import * as MisskeyIoComponentSchemas from "./MisskeyIoComponentSchemas.mjs";
 S.enableJson();
 
 let postHashtagsListRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  attachedToUserOnly: s.fieldOr("attachedToUserOnly", S.nullableAsOption(S.bool), undefined),
-  attachedToLocalUserOnly: s.fieldOr("attachedToLocalUserOnly", S.nullableAsOption(S.bool), undefined),
-  attachedToRemoteUserOnly: s.fieldOr("attachedToRemoteUserOnly", S.nullableAsOption(S.bool), undefined),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  attachedToUserOnly: s.f("attachedToUserOnly", S.option(S.bool)),
+  attachedToLocalUserOnly: s.f("attachedToLocalUserOnly", S.option(S.bool)),
+  attachedToRemoteUserOnly: s.f("attachedToRemoteUserOnly", S.option(S.bool)),
   sort: s.f("sort", S.string)
 }));
 
@@ -21,9 +21,9 @@ function postHashtagsList(body, fetch) {
 }
 
 let postHashtagsSearchRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
   query: s.f("query", S.string),
-  offset: s.fieldOr("offset", S.nullableAsOption(S.int), undefined)
+  offset: s.f("offset", S.option(S.int))
 }));
 
 let postHashtagsSearchResponseSchema = S.array(S.string);
@@ -70,12 +70,12 @@ function postHashtagsTrend(fetch) {
 
 let postHashtagsUsersRequestSchema = S.object(s => ({
   tag: s.f("tag", S.string),
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
   sort: s.f("sort", S.string),
-  state: s.fieldOr("state", S.nullableAsOption(S.string), undefined),
-  origin: s.fieldOr("origin", S.nullableAsOption(S.string), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  state: s.f("state", S.option(S.string)),
+  origin: s.f("origin", S.option(S.string)),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postHashtagsUsersResponseSchema = S.array(MisskeyIoComponentSchemas.UserDetailed.schema);

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

@@ -27,10 +27,10 @@ function postUsersListsDelete(body, fetch) {
 
 let postUsersListsGetMembershipsRequestSchema = S.object(s => ({
   listId: s.f("listId", S.string),
-  forPublic: s.fieldOr("forPublic", 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)
+  forPublic: s.f("forPublic", 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 postUsersListsGetMembershipsResponse_1Schema = S.object(s => ({
@@ -49,7 +49,7 @@ function postUsersListsGetMemberships(body, fetch) {
 }
 
 let postUsersListsListRequestSchema = S.object(s => ({
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined)
+  userId: s.f("userId", S.option(S.string))
 }));
 
 let postUsersListsListResponseSchema = S.array(MisskeyIoComponentSchemas.UserList.schema);
@@ -81,7 +81,7 @@ function postUsersListsPush(body, fetch) {
 
 let postUsersListsShowRequestSchema = S.object(s => ({
   listId: s.f("listId", S.string),
-  forPublic: s.fieldOr("forPublic", S.nullableAsOption(S.bool), undefined)
+  forPublic: s.f("forPublic", S.option(S.bool))
 }));
 
 let postUsersListsShowResponseSchema = MisskeyIoComponentSchemas.UserList.schema;
@@ -93,8 +93,8 @@ function postUsersListsShow(body, fetch) {
 
 let postUsersListsUpdateRequestSchema = S.object(s => ({
   listId: s.f("listId", S.string),
-  name: s.fieldOr("name", S.nullableAsOption(S.max(S.min(S.string, 1, undefined), 100, undefined)), undefined),
-  isPublic: s.fieldOr("isPublic", S.nullableAsOption(S.bool), undefined)
+  name: s.f("name", S.option(S.max(S.min(S.string, 1, undefined), 100, undefined))),
+  isPublic: s.f("isPublic", S.option(S.bool))
 }));
 
 let postUsersListsUpdateResponseSchema = MisskeyIoComponentSchemas.UserList.schema;
@@ -107,7 +107,7 @@ function postUsersListsUpdate(body, fetch) {
 let postUsersListsUpdateMembershipRequestSchema = S.object(s => ({
   listId: s.f("listId", S.string),
   userId: s.f("userId", S.string),
-  withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), undefined)
+  withReplies: s.f("withReplies", S.option(S.bool))
 }));
 
 function postUsersListsUpdateMembership(body, fetch) {

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

@@ -31,15 +31,15 @@ let postAdminMetaResponseSchema = S.object(s => ({
   enableEmail: s.f("enableEmail", S.bool),
   enableServiceWorker: s.f("enableServiceWorker", S.bool),
   translatorAvailable: s.f("translatorAvailable", S.bool),
-  silencedHosts: s.fieldOr("silencedHosts", S.nullableAsOption(S.array(S.string)), undefined),
-  sensitiveMediaHosts: s.fieldOr("sensitiveMediaHosts", S.nullableAsOption(S.array(S.string)), undefined),
+  silencedHosts: s.f("silencedHosts", S.option(S.array(S.string))),
+  sensitiveMediaHosts: s.f("sensitiveMediaHosts", S.option(S.array(S.string))),
   pinnedUsers: s.f("pinnedUsers", S.array(S.string)),
   hiddenTags: s.f("hiddenTags", S.array(S.string)),
   blockedHosts: s.f("blockedHosts", S.array(S.string)),
   blockedRemoteCustomEmojis: s.f("blockedRemoteCustomEmojis", S.array(S.string)),
   sensitiveWords: s.f("sensitiveWords", S.array(S.string)),
   prohibitedWords: s.f("prohibitedWords", S.array(S.string)),
-  bannedEmailDomains: s.fieldOr("bannedEmailDomains", S.nullableAsOption(S.array(S.string)), undefined),
+  bannedEmailDomains: s.f("bannedEmailDomains", S.option(S.array(S.string))),
   preservedUsernames: s.f("preservedUsernames", S.array(S.string)),
   hcaptchaSecretKey: s.f("hcaptchaSecretKey", S.nullableAsOption(S.string)),
   mcaptchaSecretKey: s.f("mcaptchaSecretKey", S.nullableAsOption(S.string)),
@@ -141,11 +141,11 @@ function postAnnouncement(body, fetch) {
 }
 
 let postAnnouncementsRequestSchema = 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),
-  offset: s.fieldOr("offset", S.nullableAsOption(S.int), undefined),
-  isActive: s.fieldOr("isActive", 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)),
+  offset: s.f("offset", S.option(S.int)),
+  isActive: s.f("isActive", S.option(S.bool))
 }));
 
 let postAnnouncementsResponseSchema = S.array(MisskeyIoComponentSchemas.Announcement.schema);
@@ -250,63 +250,63 @@ let getFetchRssRequestSchema = S.object(s => ({
 }));
 
 let getFetchRssResponse_6Schema = S.object(s => ({
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  email: s.fieldOr("email", S.nullableAsOption(S.string), undefined)
+  name: s.f("name", S.option(S.string)),
+  email: s.f("email", S.option(S.string))
 }));
 
 let getFetchRssResponse_5Schema = S.object(s => ({
   url: s.f("url", S.string),
-  length: s.fieldOr("length", S.nullableAsOption(S.float), undefined),
-  type: s.fieldOr("type", S.nullableAsOption(S.string), undefined)
+  length: s.f("length", S.option(S.float)),
+  type: s.f("type", S.option(S.string))
 }));
 
 let getFetchRssResponse_4Schema = S.object(s => ({
-  image: s.fieldOr("image", S.nullableAsOption(S.string), undefined),
-  owner: s.fieldOr("owner", S.nullableAsOption(getFetchRssResponse_6Schema), undefined),
-  author: s.fieldOr("author", S.nullableAsOption(S.string), undefined),
-  summary: s.fieldOr("summary", S.nullableAsOption(S.string), undefined),
-  explicit: s.fieldOr("explicit", S.nullableAsOption(S.string), undefined),
-  categories: s.fieldOr("categories", S.nullableAsOption(S.array(S.string)), undefined),
-  keywords: s.fieldOr("keywords", S.nullableAsOption(S.array(S.string)), undefined)
+  image: s.f("image", S.option(S.string)),
+  owner: s.f("owner", S.option(getFetchRssResponse_6Schema)),
+  author: s.f("author", S.option(S.string)),
+  summary: s.f("summary", S.option(S.string)),
+  explicit: s.f("explicit", S.option(S.string)),
+  categories: s.f("categories", S.option(S.array(S.string))),
+  keywords: s.f("keywords", S.option(S.array(S.string)))
 }));
 
 let getFetchRssResponse_3Schema = S.object(s => ({
-  link: s.fieldOr("link", S.nullableAsOption(S.string), undefined),
-  guid: s.fieldOr("guid", S.nullableAsOption(S.string), undefined),
-  title: s.fieldOr("title", S.nullableAsOption(S.string), undefined),
-  pubDate: s.fieldOr("pubDate", S.nullableAsOption(S.string), undefined),
-  creator: s.fieldOr("creator", S.nullableAsOption(S.string), undefined),
-  summary: s.fieldOr("summary", S.nullableAsOption(S.string), undefined),
-  content: s.fieldOr("content", S.nullableAsOption(S.string), undefined),
-  isoDate: s.fieldOr("isoDate", S.nullableAsOption(S.string), undefined),
-  categories: s.fieldOr("categories", S.nullableAsOption(S.array(S.string)), undefined),
-  contentSnippet: s.fieldOr("contentSnippet", S.nullableAsOption(S.string), undefined),
-  enclosure: s.fieldOr("enclosure", S.nullableAsOption(getFetchRssResponse_5Schema), undefined)
+  link: s.f("link", S.option(S.string)),
+  guid: s.f("guid", S.option(S.string)),
+  title: s.f("title", S.option(S.string)),
+  pubDate: s.f("pubDate", S.option(S.string)),
+  creator: s.f("creator", S.option(S.string)),
+  summary: s.f("summary", S.option(S.string)),
+  content: s.f("content", S.option(S.string)),
+  isoDate: s.f("isoDate", S.option(S.string)),
+  categories: s.f("categories", S.option(S.array(S.string))),
+  contentSnippet: s.f("contentSnippet", S.option(S.string)),
+  enclosure: s.f("enclosure", S.option(getFetchRssResponse_5Schema))
 }));
 
 let getFetchRssResponse_2Schema = S.object(s => ({
-  self: s.fieldOr("self", S.nullableAsOption(S.string), undefined),
-  first: s.fieldOr("first", S.nullableAsOption(S.string), undefined),
-  next: s.fieldOr("next", S.nullableAsOption(S.string), undefined),
-  last: s.fieldOr("last", S.nullableAsOption(S.string), undefined),
-  prev: s.fieldOr("prev", S.nullableAsOption(S.string), undefined)
+  self: s.f("self", S.option(S.string)),
+  first: s.f("first", S.option(S.string)),
+  next: s.f("next", S.option(S.string)),
+  last: s.f("last", S.option(S.string)),
+  prev: s.f("prev", S.option(S.string))
 }));
 
 let getFetchRssResponse_1Schema = S.object(s => ({
-  link: s.fieldOr("link", S.nullableAsOption(S.string), undefined),
+  link: s.f("link", S.option(S.string)),
   url: s.f("url", S.string),
-  title: s.fieldOr("title", S.nullableAsOption(S.string), undefined)
+  title: s.f("title", S.option(S.string))
 }));
 
 let getFetchRssResponseSchema = S.object(s => ({
-  image: s.fieldOr("image", S.nullableAsOption(getFetchRssResponse_1Schema), undefined),
-  paginationLinks: s.fieldOr("paginationLinks", S.nullableAsOption(getFetchRssResponse_2Schema), undefined),
-  link: s.fieldOr("link", S.nullableAsOption(S.string), undefined),
-  title: s.fieldOr("title", S.nullableAsOption(S.string), undefined),
+  image: s.f("image", S.option(getFetchRssResponse_1Schema)),
+  paginationLinks: s.f("paginationLinks", S.option(getFetchRssResponse_2Schema)),
+  link: s.f("link", S.option(S.string)),
+  title: s.f("title", S.option(S.string)),
   items: s.f("items", S.array(getFetchRssResponse_3Schema)),
-  feedUrl: s.fieldOr("feedUrl", S.nullableAsOption(S.string), undefined),
-  description: s.fieldOr("description", S.nullableAsOption(S.string), undefined),
-  itunes: s.fieldOr("itunes", S.nullableAsOption(getFetchRssResponse_4Schema), undefined)
+  feedUrl: s.f("feedUrl", S.option(S.string)),
+  description: s.f("description", S.option(S.string)),
+  itunes: s.f("itunes", S.option(getFetchRssResponse_4Schema))
 }));
 
 function getFetchRss(body, fetch) {
@@ -319,63 +319,63 @@ let postFetchRssRequestSchema = S.object(s => ({
 }));
 
 let postFetchRssResponse_6Schema = S.object(s => ({
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  email: s.fieldOr("email", S.nullableAsOption(S.string), undefined)
+  name: s.f("name", S.option(S.string)),
+  email: s.f("email", S.option(S.string))
 }));
 
 let postFetchRssResponse_5Schema = S.object(s => ({
   url: s.f("url", S.string),
-  length: s.fieldOr("length", S.nullableAsOption(S.float), undefined),
-  type: s.fieldOr("type", S.nullableAsOption(S.string), undefined)
+  length: s.f("length", S.option(S.float)),
+  type: s.f("type", S.option(S.string))
 }));
 
 let postFetchRssResponse_4Schema = S.object(s => ({
-  image: s.fieldOr("image", S.nullableAsOption(S.string), undefined),
-  owner: s.fieldOr("owner", S.nullableAsOption(postFetchRssResponse_6Schema), undefined),
-  author: s.fieldOr("author", S.nullableAsOption(S.string), undefined),
-  summary: s.fieldOr("summary", S.nullableAsOption(S.string), undefined),
-  explicit: s.fieldOr("explicit", S.nullableAsOption(S.string), undefined),
-  categories: s.fieldOr("categories", S.nullableAsOption(S.array(S.string)), undefined),
-  keywords: s.fieldOr("keywords", S.nullableAsOption(S.array(S.string)), undefined)
+  image: s.f("image", S.option(S.string)),
+  owner: s.f("owner", S.option(postFetchRssResponse_6Schema)),
+  author: s.f("author", S.option(S.string)),
+  summary: s.f("summary", S.option(S.string)),
+  explicit: s.f("explicit", S.option(S.string)),
+  categories: s.f("categories", S.option(S.array(S.string))),
+  keywords: s.f("keywords", S.option(S.array(S.string)))
 }));
 
 let postFetchRssResponse_3Schema = S.object(s => ({
-  link: s.fieldOr("link", S.nullableAsOption(S.string), undefined),
-  guid: s.fieldOr("guid", S.nullableAsOption(S.string), undefined),
-  title: s.fieldOr("title", S.nullableAsOption(S.string), undefined),
-  pubDate: s.fieldOr("pubDate", S.nullableAsOption(S.string), undefined),
-  creator: s.fieldOr("creator", S.nullableAsOption(S.string), undefined),
-  summary: s.fieldOr("summary", S.nullableAsOption(S.string), undefined),
-  content: s.fieldOr("content", S.nullableAsOption(S.string), undefined),
-  isoDate: s.fieldOr("isoDate", S.nullableAsOption(S.string), undefined),
-  categories: s.fieldOr("categories", S.nullableAsOption(S.array(S.string)), undefined),
-  contentSnippet: s.fieldOr("contentSnippet", S.nullableAsOption(S.string), undefined),
-  enclosure: s.fieldOr("enclosure", S.nullableAsOption(postFetchRssResponse_5Schema), undefined)
+  link: s.f("link", S.option(S.string)),
+  guid: s.f("guid", S.option(S.string)),
+  title: s.f("title", S.option(S.string)),
+  pubDate: s.f("pubDate", S.option(S.string)),
+  creator: s.f("creator", S.option(S.string)),
+  summary: s.f("summary", S.option(S.string)),
+  content: s.f("content", S.option(S.string)),
+  isoDate: s.f("isoDate", S.option(S.string)),
+  categories: s.f("categories", S.option(S.array(S.string))),
+  contentSnippet: s.f("contentSnippet", S.option(S.string)),
+  enclosure: s.f("enclosure", S.option(postFetchRssResponse_5Schema))
 }));
 
 let postFetchRssResponse_2Schema = S.object(s => ({
-  self: s.fieldOr("self", S.nullableAsOption(S.string), undefined),
-  first: s.fieldOr("first", S.nullableAsOption(S.string), undefined),
-  next: s.fieldOr("next", S.nullableAsOption(S.string), undefined),
-  last: s.fieldOr("last", S.nullableAsOption(S.string), undefined),
-  prev: s.fieldOr("prev", S.nullableAsOption(S.string), undefined)
+  self: s.f("self", S.option(S.string)),
+  first: s.f("first", S.option(S.string)),
+  next: s.f("next", S.option(S.string)),
+  last: s.f("last", S.option(S.string)),
+  prev: s.f("prev", S.option(S.string))
 }));
 
 let postFetchRssResponse_1Schema = S.object(s => ({
-  link: s.fieldOr("link", S.nullableAsOption(S.string), undefined),
+  link: s.f("link", S.option(S.string)),
   url: s.f("url", S.string),
-  title: s.fieldOr("title", S.nullableAsOption(S.string), undefined)
+  title: s.f("title", S.option(S.string))
 }));
 
 let postFetchRssResponseSchema = S.object(s => ({
-  image: s.fieldOr("image", S.nullableAsOption(postFetchRssResponse_1Schema), undefined),
-  paginationLinks: s.fieldOr("paginationLinks", S.nullableAsOption(postFetchRssResponse_2Schema), undefined),
-  link: s.fieldOr("link", S.nullableAsOption(S.string), undefined),
-  title: s.fieldOr("title", S.nullableAsOption(S.string), undefined),
+  image: s.f("image", S.option(postFetchRssResponse_1Schema)),
+  paginationLinks: s.f("paginationLinks", S.option(postFetchRssResponse_2Schema)),
+  link: s.f("link", S.option(S.string)),
+  title: s.f("title", S.option(S.string)),
   items: s.f("items", S.array(postFetchRssResponse_3Schema)),
-  feedUrl: s.fieldOr("feedUrl", S.nullableAsOption(S.string), undefined),
-  description: s.fieldOr("description", S.nullableAsOption(S.string), undefined),
-  itunes: s.fieldOr("itunes", S.nullableAsOption(postFetchRssResponse_4Schema), undefined)
+  feedUrl: s.f("feedUrl", S.option(S.string)),
+  description: s.f("description", S.option(S.string)),
+  itunes: s.f("itunes", S.option(postFetchRssResponse_4Schema))
 }));
 
 function postFetchRss(body, fetch) {
@@ -423,9 +423,9 @@ function postInviteLimit(fetch) {
 }
 
 let postInviteListRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string))
 }));
 
 let postInviteListResponseSchema = S.array(MisskeyIoComponentSchemas.InviteCode.schema);
@@ -436,7 +436,7 @@ function postInviteList(body, fetch) {
 }
 
 let getMetaRequestSchema = S.object(s => ({
-  detail: s.fieldOr("detail", S.nullableAsOption(S.bool), undefined)
+  detail: s.f("detail", S.option(S.bool))
 }));
 
 let getMetaResponseSchema = S.dict(S.json);
@@ -447,7 +447,7 @@ function getMeta(body, fetch) {
 }
 
 let postMetaRequestSchema = S.object(s => ({
-  detail: s.fieldOr("detail", S.nullableAsOption(S.bool), undefined)
+  detail: s.f("detail", S.option(S.bool))
 }));
 
 let postMetaResponseSchema = S.dict(S.json);

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

@@ -10,18 +10,18 @@ function postResetDb(fetch) {
 
 let postTestRequestSchema = S.object(s => ({
   required: s.f("required", S.bool),
-  string: s.fieldOr("string", S.nullableAsOption(S.string), undefined),
-  default: s.fieldOr("default", S.nullableAsOption(S.string), undefined),
-  nullableDefault: s.fieldOr("nullableDefault", S.nullableAsOption(S.string), undefined),
-  id: s.fieldOr("id", S.nullableAsOption(S.string), undefined)
+  string: s.f("string", S.option(S.string)),
+  default: s.f("default", S.option(S.string)),
+  nullableDefault: s.f("nullableDefault", S.option(S.string)),
+  id: s.f("id", S.option(S.string))
 }));
 
 let postTestResponseSchema = S.object(s => ({
-  id: s.fieldOr("id", S.nullableAsOption(S.string), undefined),
+  id: s.f("id", S.option(S.string)),
   required: s.f("required", S.bool),
-  string: s.fieldOr("string", S.nullableAsOption(S.string), undefined),
-  default: s.fieldOr("default", S.nullableAsOption(S.string), undefined),
-  nullableDefault: s.fieldOr("nullableDefault", S.nullableAsOption(S.string), undefined)
+  string: s.f("string", S.option(S.string)),
+  default: s.f("default", S.option(S.string)),
+  nullableDefault: s.f("nullableDefault", S.option(S.string))
 }));
 
 function postTest(body, fetch) {