@f3liz/rescript-misskey-api 0.6.4 → 0.6.6

package/lib/es6/src/generated/kokonect-link/api/KokonectLinkDefault.mjs

@@ -24,11 +24,11 @@ function postIRevokeToken(body, fetch) {
 }
 
 let postISigninHistoryRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int))
 }));
 
 let postISigninHistoryResponseSchema = S.array(KokonectLinkComponentSchemas.Signin.schema);
@@ -40,7 +40,7 @@ function postISigninHistory(body, fetch) {
 
 let postITruncateAccountRequestSchema = S.object(s => ({
   password: s.f("password", S.string),
-  token: s.fieldOr("token", S.nullableAsOption(S.string), undefined)
+  token: s.f("token", S.option(S.string))
 }));
 
 function postITruncateAccount(body, fetch) {
@@ -50,8 +50,8 @@ function postITruncateAccount(body, fetch) {
 
 let postIUpdateEmailRequestSchema = S.object(s => ({
   password: s.f("password", S.string),
-  email: s.fieldOr("email", S.nullableAsOption(S.string), undefined),
-  token: s.fieldOr("token", S.nullableAsOption(S.string), undefined)
+  email: s.f("email", S.option(S.string)),
+  token: s.f("token", S.option(S.string))
 }));
 
 let postIUpdateEmailResponseSchema = KokonectLinkComponentSchemas.MeDetailed.schema;
@@ -62,12 +62,12 @@ function postIUpdateEmail(body, fetch) {
 }
 
 let postReversiGamesRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  my: s.fieldOr("my", S.nullableAsOption(S.bool), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  my: s.f("my", S.option(S.bool))
 }));
 
 let postReversiGamesResponseSchema = S.array(KokonectLinkComponentSchemas.ReversiGameLite.schema);
@@ -78,9 +78,9 @@ function postReversiGames(body, fetch) {
 }
 
 let postReversiMatchRequestSchema = S.object(s => ({
-  userId: s.fieldOr("userId", S.nullableAsOption(S.string), undefined),
-  noIrregularRules: s.fieldOr("noIrregularRules", S.nullableAsOption(S.bool), undefined),
-  multiple: s.fieldOr("multiple", S.nullableAsOption(S.bool), undefined)
+  userId: s.f("userId", S.option(S.string)),
+  noIrregularRules: s.f("noIrregularRules", S.option(S.bool)),
+  multiple: s.f("multiple", S.option(S.bool))
 }));
 
 let postReversiMatchResponseSchema = KokonectLinkComponentSchemas.ReversiGameDetailed.schema;
@@ -108,7 +108,7 @@ let postReversiVerifyRequestSchema = S.object(s => ({
 
 let postReversiVerifyResponseSchema = S.object(s => ({
   desynced: s.f("desynced", S.bool),
-  game: s.fieldOr("game", S.nullableAsOption(KokonectLinkComponentSchemas.ReversiGameDetailed.schema), undefined)
+  game: s.f("game", S.option(KokonectLinkComponentSchemas.ReversiGameDetailed.schema))
 }));
 
 function postReversiVerify(body, fetch) {

package/lib/es6/src/generated/kokonect-link/api/KokonectLinkDrive.mjs

@@ -6,14 +6,14 @@ import * as KokonectLinkComponentSchemas from "./KokonectLinkComponentSchemas.mj
 S.enableJson();
 
 let postDriveFilesRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), undefined),
-  type: s.fieldOr("type", S.nullableAsOption(S.pattern(S.string, /^[a-zA-Z\/\*-]+$/, undefined)), 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))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  folderId: s.f("folderId", S.option(S.string)),
+  type: s.f("type", S.option(S.pattern(S.string, /^[a-zA-Z\/\*-]+$/, undefined))),
+  sort: s.f("sort", S.option(S.string))
 }));
 
 let postDriveFilesResponseSchema = S.array(KokonectLinkComponentSchemas.DriveFile.schema);
@@ -24,11 +24,11 @@ function postDriveFiles(body, fetch) {
 }
 
 let postDriveFilesAttachedChatMessagesRequestSchema = S.object(s => ({
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
   fileId: s.f("fileId", S.string)
 }));
 
@@ -40,11 +40,11 @@ function postDriveFilesAttachedChatMessages(body, fetch) {
 }
 
 let postDriveFilesAttachedNotesRequestSchema = S.object(s => ({
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
   fileId: s.f("fileId", S.string)
 }));
 
@@ -56,11 +56,11 @@ function postDriveFilesAttachedNotes(body, fetch) {
 }
 
 let postDriveFilesCreateRequestSchema = S.object(s => ({
-  folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), undefined),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  comment: s.fieldOr("comment", S.nullableAsOption(S.max(S.string, 512, undefined)), undefined),
-  isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), undefined),
-  force: s.fieldOr("force", S.nullableAsOption(S.bool), undefined),
+  folderId: s.f("folderId", S.option(S.string)),
+  name: s.f("name", S.option(S.string)),
+  comment: s.f("comment", S.option(S.max(S.string, 512, undefined))),
+  isSensitive: s.f("isSensitive", S.option(S.bool)),
+  force: s.f("force", S.option(S.bool)),
   file: s.f("file", S.string)
 }));
 
@@ -73,7 +73,7 @@ function postDriveFilesCreate(body, fetch) {
 
 let postDriveFilesMoveBulkRequestSchema = S.object(s => ({
   fileIds: s.f("fileIds", S.array(S.string)),
-  folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), undefined)
+  folderId: s.f("folderId", S.option(S.string))
 }));
 
 function postDriveFilesMoveBulk(body, fetch) {
@@ -94,10 +94,10 @@ function postDriveFilesShow(body, fetch) {
 
 let postDriveFilesUpdateRequestSchema = S.object(s => ({
   fileId: s.f("fileId", S.string),
-  folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), undefined),
-  name: s.fieldOr("name", S.nullableAsOption(S.string), undefined),
-  isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), undefined),
-  comment: s.fieldOr("comment", S.nullableAsOption(S.max(S.string, 512, undefined)), undefined)
+  folderId: s.f("folderId", S.option(S.string)),
+  name: s.f("name", S.option(S.string)),
+  isSensitive: s.f("isSensitive", S.option(S.bool)),
+  comment: s.f("comment", S.option(S.max(S.string, 512, undefined)))
 }));
 
 let postDriveFilesUpdateResponseSchema = KokonectLinkComponentSchemas.DriveFile.schema;
@@ -108,12 +108,12 @@ function postDriveFilesUpdate(body, fetch) {
 }
 
 let postDriveFoldersRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  folderId: s.fieldOr("folderId", 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  folderId: s.f("folderId", S.option(S.string))
 }));
 
 let postDriveFoldersResponseSchema = S.array(KokonectLinkComponentSchemas.DriveFolder.schema);
@@ -124,8 +124,8 @@ function postDriveFolders(body, fetch) {
 }
 
 let postDriveFoldersCreateRequestSchema = S.object(s => ({
-  name: s.fieldOr("name", S.nullableAsOption(S.max(S.string, 200, undefined)), undefined),
-  parentId: s.fieldOr("parentId", S.nullableAsOption(S.string), undefined)
+  name: s.f("name", S.option(S.max(S.string, 200, undefined))),
+  parentId: s.f("parentId", S.option(S.string))
 }));
 
 let postDriveFoldersCreateResponseSchema = KokonectLinkComponentSchemas.DriveFolder.schema;
@@ -148,8 +148,8 @@ function postDriveFoldersShow(body, fetch) {
 
 let postDriveFoldersUpdateRequestSchema = S.object(s => ({
   folderId: s.f("folderId", S.string),
-  name: s.fieldOr("name", S.nullableAsOption(S.max(S.string, 200, undefined)), undefined),
-  parentId: s.fieldOr("parentId", S.nullableAsOption(S.string), undefined)
+  name: s.f("name", S.option(S.max(S.string, 200, undefined))),
+  parentId: s.f("parentId", S.option(S.string))
 }));
 
 let postDriveFoldersUpdateResponseSchema = KokonectLinkComponentSchemas.DriveFolder.schema;
@@ -160,12 +160,12 @@ function postDriveFoldersUpdate(body, fetch) {
 }
 
 let postDriveStreamRequestSchema = S.object(s => ({
-  limit: s.fieldOr("limit", S.nullableAsOption(S.max(S.min(S.int, 1, undefined), 100, undefined)), undefined),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  type: s.fieldOr("type", S.nullableAsOption(S.pattern(S.string, /^[a-zA-Z\/\*-]+$/, undefined)), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  type: s.f("type", S.option(S.pattern(S.string, /^[a-zA-Z\/\*-]+$/, undefined)))
 }));
 
 let postDriveStreamResponseSchema = S.array(KokonectLinkComponentSchemas.DriveFile.schema);

package/lib/es6/src/generated/kokonect-link/api/KokonectLinkFederation.mjs

@@ -7,11 +7,11 @@ S.enableJson();
 
 let postFederationFollowersRequestSchema = S.object(s => ({
   host: s.f("host", S.string),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined)))
 }));
 
 let postFederationFollowersResponseSchema = S.array(KokonectLinkComponentSchemas.Following.schema);
@@ -23,11 +23,11 @@ function postFederationFollowers(body, fetch) {
 
 let postFederationFollowingRequestSchema = S.object(s => ({
   host: s.f("host", S.string),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined)))
 }));
 
 let postFederationFollowingResponseSchema = S.array(KokonectLinkComponentSchemas.Following.schema);
@@ -38,14 +38,14 @@ function postFederationFollowing(body, fetch) {
 }
 
 let getFederationRemoteSoftwareRequestSchema = S.object(s => ({
-  blocked: s.fieldOr("blocked", S.nullableAsOption(S.bool), undefined),
-  notResponding: s.fieldOr("notResponding", S.nullableAsOption(S.bool), undefined),
-  suspended: s.fieldOr("suspended", S.nullableAsOption(S.bool), undefined),
-  silenced: s.fieldOr("silenced", S.nullableAsOption(S.bool), undefined),
-  federating: s.fieldOr("federating", S.nullableAsOption(S.bool), undefined),
-  subscribing: s.fieldOr("subscribing", S.nullableAsOption(S.bool), undefined),
-  publishing: s.fieldOr("publishing", S.nullableAsOption(S.bool), undefined),
-  quarantined: s.fieldOr("quarantined", S.nullableAsOption(S.bool), undefined)
+  blocked: s.f("blocked", S.option(S.bool)),
+  notResponding: s.f("notResponding", S.option(S.bool)),
+  suspended: s.f("suspended", S.option(S.bool)),
+  silenced: s.f("silenced", S.option(S.bool)),
+  federating: s.f("federating", S.option(S.bool)),
+  subscribing: s.f("subscribing", S.option(S.bool)),
+  publishing: s.f("publishing", S.option(S.bool)),
+  quarantined: s.f("quarantined", S.option(S.bool))
 }));
 
 let getFederationRemoteSoftwareResponse_1Schema = S.object(s => ({
@@ -62,14 +62,14 @@ function getFederationRemoteSoftware(body, fetch) {
 }
 
 let postFederationRemoteSoftwareRequestSchema = S.object(s => ({
-  blocked: s.fieldOr("blocked", S.nullableAsOption(S.bool), undefined),
-  notResponding: s.fieldOr("notResponding", S.nullableAsOption(S.bool), undefined),
-  suspended: s.fieldOr("suspended", S.nullableAsOption(S.bool), undefined),
-  silenced: s.fieldOr("silenced", S.nullableAsOption(S.bool), undefined),
-  federating: s.fieldOr("federating", S.nullableAsOption(S.bool), undefined),
-  subscribing: s.fieldOr("subscribing", S.nullableAsOption(S.bool), undefined),
-  publishing: s.fieldOr("publishing", S.nullableAsOption(S.bool), undefined),
-  quarantined: s.fieldOr("quarantined", S.nullableAsOption(S.bool), undefined)
+  blocked: s.f("blocked", S.option(S.bool)),
+  notResponding: s.f("notResponding", S.option(S.bool)),
+  suspended: s.f("suspended", S.option(S.bool)),
+  silenced: s.f("silenced", S.option(S.bool)),
+  federating: s.f("federating", S.option(S.bool)),
+  subscribing: s.f("subscribing", S.option(S.bool)),
+  publishing: s.f("publishing", S.option(S.bool)),
+  quarantined: s.f("quarantined", S.option(S.bool))
 }));
 
 let postFederationRemoteSoftwareResponse_1Schema = S.object(s => ({
@@ -98,11 +98,11 @@ function postFederationShowInstance(body, fetch) {
 
 let postFederationUsersRequestSchema = S.object(s => ({
   host: s.f("host", S.string),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined)))
 }));
 
 let postFederationUsersResponseSchema = S.array(KokonectLinkComponentSchemas.UserDetailedNotMe.schema);

package/lib/es6/src/generated/kokonect-link/api/KokonectLinkFlash.mjs

@@ -10,7 +10,7 @@ let postFlashCreateRequestSchema = S.object(s => ({
   summary: s.f("summary", S.string),
   script: s.f("script", S.string),
   permissions: s.f("permissions", S.array(S.string)),
-  visibility: s.fieldOr("visibility", S.nullableAsOption(S.string), undefined)
+  visibility: s.f("visibility", S.option(S.string))
 }));
 
 let postFlashCreateResponseSchema = KokonectLinkComponentSchemas.Flash.schema;
@@ -35,11 +35,11 @@ function postFlashGenToken(body, fetch) {
 
 let postFlashSearchRequestSchema = S.object(s => ({
   query: s.f("query", S.max(S.min(S.string, 1, undefined), 100, undefined)),
-  sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), undefined),
-  untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), undefined),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined),
-  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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined)))
 }));
 
 let postFlashSearchResponseSchema = S.array(KokonectLinkComponentSchemas.Flash.schema);

package/lib/es6/src/generated/kokonect-link/api/KokonectLinkFollowing.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 = KokonectLinkComponentSchemas.UserLite.schema;
@@ -51,11 +51,11 @@ 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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined)))
 }));
 
 let postFollowingRequestsListResponse_1Schema = S.object(s => ({
@@ -72,11 +72,11 @@ function postFollowingRequestsList(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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined)))
 }));
 
 let postFollowingRequestsSentResponse_1Schema = S.object(s => ({
@@ -94,8 +94,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 = KokonectLinkComponentSchemas.UserLite.schema;

package/lib/es6/src/generated/kokonect-link/api/KokonectLinkGallery.mjs

@@ -6,11 +6,11 @@ import * as KokonectLinkComponentSchemas from "./KokonectLinkComponentSchemas.mj
 S.enableJson();
 
 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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int))
 }));
 
 let postGalleryPostsResponseSchema = S.array(KokonectLinkComponentSchemas.GalleryPost.schema);
@@ -22,9 +22,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 = KokonectLinkComponentSchemas.GalleryPost.schema;
@@ -47,10 +47,10 @@ function postGalleryPostsShow(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 = KokonectLinkComponentSchemas.GalleryPost.schema;

package/lib/es6/src/generated/kokonect-link/api/KokonectLinkHashtags.mjs

@@ -18,10 +18,10 @@ function postHashtagsShow(body, 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)
+  state: s.f("state", S.option(S.string)),
+  origin: s.f("origin", S.option(S.string))
 }));
 
 let postHashtagsUsersResponseSchema = S.array(KokonectLinkComponentSchemas.UserDetailed.schema);

package/lib/es6/src/generated/kokonect-link/api/KokonectLinkLists.mjs

@@ -18,12 +18,12 @@ function postUsersListsCreate(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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int))
 }));
 
 let postUsersListsGetMembershipsResponse_1Schema = S.object(s => ({
@@ -43,8 +43,8 @@ function postUsersListsGetMemberships(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 = KokonectLinkComponentSchemas.UserList.schema;

package/lib/es6/src/generated/kokonect-link/api/KokonectLinkMeta.mjs

@@ -39,7 +39,7 @@ let postAdminMetaResponseSchema = S.object(s => ({
   enableServiceWorker: s.f("enableServiceWorker", S.bool),
   translatorAvailable: s.f("translatorAvailable", S.bool),
   translatorType: s.f("translatorType", S.nullableAsOption(S.string)),
-  silencedHosts: s.fieldOr("silencedHosts", S.nullableAsOption(S.array(S.string)), undefined),
+  silencedHosts: s.f("silencedHosts", S.option(S.array(S.string))),
   mediaSilencedHosts: s.f("mediaSilencedHosts", S.array(S.string)),
   pinnedUsers: s.f("pinnedUsers", S.array(S.string)),
   hiddenTags: s.f("hiddenTags", S.array(S.string)),
@@ -47,7 +47,7 @@ let postAdminMetaResponseSchema = S.object(s => ({
   sensitiveWords: s.f("sensitiveWords", S.array(S.string)),
   prohibitedWords: s.f("prohibitedWords", S.array(S.string)),
   prohibitedWordsForNameOfUser: s.f("prohibitedWordsForNameOfUser", 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)),
@@ -164,7 +164,7 @@ let postAdminMetaResponseSchema = S.object(s => ({
   emailToReceiveAbuseReport: s.f("emailToReceiveAbuseReport", S.nullableAsOption(S.string)),
   enableReceivePrerelease: s.f("enableReceivePrerelease", S.bool),
   skipVersion: s.f("skipVersion", S.bool),
-  skipCherryPickVersion: s.fieldOr("skipCherryPickVersion", S.nullableAsOption(S.string), undefined),
+  skipCherryPickVersion: s.f("skipCherryPickVersion", S.option(S.string)),
   trustedLinkUrlPatterns: s.f("trustedLinkUrlPatterns", S.array(S.string)),
   customSplashText: s.f("customSplashText", S.array(S.string)),
   disableRegistrationWhenInactive: s.f("disableRegistrationWhenInactive", S.bool),
@@ -180,12 +180,12 @@ function postAdminMeta(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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", 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)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int)),
+  isActive: s.f("isActive", S.option(S.bool))
 }));
 
 let postAnnouncementsResponseSchema = S.array(KokonectLinkComponentSchemas.Announcement.schema);
@@ -235,11 +235,11 @@ function postInviteCreate(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),
-  sinceDate: s.fieldOr("sinceDate", S.nullableAsOption(S.int), undefined),
-  untilDate: s.fieldOr("untilDate", S.nullableAsOption(S.int), undefined)
+  limit: s.f("limit", S.option(S.max(S.min(S.int, 1, undefined), 100, undefined))),
+  sinceId: s.f("sinceId", S.option(S.string)),
+  untilId: s.f("untilId", S.option(S.string)),
+  sinceDate: s.f("sinceDate", S.option(S.int)),
+  untilDate: s.f("untilDate", S.option(S.int))
 }));
 
 let postInviteListResponseSchema = S.array(KokonectLinkComponentSchemas.InviteCode.schema);