@f3liz/rescript-misskey-api 0.6.5 → 0.6.6

package/src/generated/misskey-io/api/MisskeyIoDefault.res

@@ -231,7 +231,7 @@ type postI2faKeyDoneRequest = {
 
 let postI2faKeyDoneRequestSchema = S.object(s => {
     password: s.field("password", S.string),
-    token: s.fieldOr("token", S.nullableAsOption(S.string), None),
+    token: s.field("token", S.option(S.string)),
     name: s.field("name", S.string->S.min(1)->S.max(30)),
     credential: s.field("credential", S.dict(S.json)),
   })
@@ -305,7 +305,7 @@ type postI2faRegisterRequest = {
 
 let postI2faRegisterRequestSchema = S.object(s => {
     password: s.field("password", S.string),
-    token: s.fieldOr("token", S.nullableAsOption(S.string), None),
+    token: s.field("token", S.option(S.string)),
   })
 
 type postI2faRegisterResponse = {
@@ -352,7 +352,7 @@ type postI2faRegisterKeyRequest = {
 
 let postI2faRegisterKeyRequestSchema = S.object(s => {
     password: s.field("password", S.string),
-    token: s.fieldOr("token", S.nullableAsOption(S.string), None),
+    token: s.field("token", S.option(S.string)),
   })
 
 type postI2faRegisterKeyResponse_5 = {
@@ -418,7 +418,7 @@ let postI2faRegisterKeyResponse_2Schema = S.object(s => {
   })
 
 let postI2faRegisterKeyResponse_1Schema = S.object(s => {
-    id: s.fieldOr("id", S.nullableAsOption(S.string), None),
+    id: s.field("id", S.option(S.string)),
   })
 
 let postI2faRegisterKeyResponseSchema = S.object(s => {
@@ -462,7 +462,7 @@ type postI2faRemoveKeyRequest = {
 
 let postI2faRemoveKeyRequestSchema = S.object(s => {
     password: s.field("password", S.string),
-    token: s.fieldOr("token", S.nullableAsOption(S.string), None),
+    token: s.field("token", S.option(S.string)),
     credentialId: s.field("credentialId", S.string),
   })
 
@@ -496,7 +496,7 @@ type postI2faUnregisterRequest = {
 
 let postI2faUnregisterRequestSchema = S.object(s => {
     password: s.field("password", S.string),
-    token: s.fieldOr("token", S.nullableAsOption(S.string), None),
+    token: s.field("token", S.option(S.string)),
   })
 
 type postI2faUnregisterResponse = unit
@@ -560,7 +560,7 @@ type postIAppsRequest = {
 }
 
 let postIAppsRequestSchema = S.object(s => {
-    sort: s.fieldOr("sort", S.nullableAsOption(S.string), None),
+    sort: s.field("sort", S.option(S.string)),
   })
 
 type postIAppsResponse_1 = {
@@ -575,9 +575,9 @@ type postIAppsResponse = array<postIAppsResponse_1>
 
 let postIAppsResponse_1Schema = S.object(s => {
     id: s.field("id", S.string),
-    name: s.fieldOr("name", S.nullableAsOption(S.string), None),
+    name: s.field("name", S.option(S.string)),
     createdAt: s.field("createdAt", S.string),
-    lastUsedAt: s.fieldOr("lastUsedAt", S.nullableAsOption(S.string), None),
+    lastUsedAt: s.field("lastUsedAt", S.option(S.string)),
     permission: s.field("permission", S.array(S.string)),
   })
 
@@ -611,9 +611,9 @@ type postIAuthorizedAppsRequest = {
 }
 
 let postIAuthorizedAppsRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    offset: s.fieldOr("offset", S.nullableAsOption(S.int), None),
-    sort: s.fieldOr("sort", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    offset: s.field("offset", S.option(S.int)),
+    sort: s.field("sort", S.option(S.string)),
   })
 
 type postIAuthorizedAppsResponse_1 = {
@@ -631,7 +631,7 @@ let postIAuthorizedAppsResponse_1Schema = S.object(s => {
     name: s.field("name", S.string),
     callbackUrl: s.field("callbackUrl", S.nullableAsOption(S.string)),
     permission: s.field("permission", S.array(S.string)),
-    isAuthorized: s.fieldOr("isAuthorized", S.nullableAsOption(S.bool), None),
+    isAuthorized: s.field("isAuthorized", S.option(S.bool)),
   })
 
 let postIAuthorizedAppsResponseSchema = S.array(postIAuthorizedAppsResponse_1Schema)
@@ -666,7 +666,7 @@ type postIChangePasswordRequest = {
 let postIChangePasswordRequestSchema = S.object(s => {
     currentPassword: s.field("currentPassword", S.string),
     newPassword: s.field("newPassword", S.string->S.min(1)),
-    token: s.fieldOr("token", S.nullableAsOption(S.string), None),
+    token: s.field("token", S.option(S.string)),
   })
 
 type postIChangePasswordResponse = unit
@@ -729,7 +729,7 @@ type postIDeleteAccountRequest = {
 
 let postIDeleteAccountRequestSchema = S.object(s => {
     password: s.field("password", S.string),
-    token: s.fieldOr("token", S.nullableAsOption(S.string), None),
+    token: s.field("token", S.option(S.string)),
   })
 
 type postIDeleteAccountResponse = unit
@@ -853,8 +853,8 @@ type postIExportFollowingRequest = {
 }
 
 let postIExportFollowingRequestSchema = S.object(s => {
-    excludeMuting: s.fieldOr("excludeMuting", S.nullableAsOption(S.bool), None),
-    excludeInactive: s.fieldOr("excludeInactive", S.nullableAsOption(S.bool), None),
+    excludeMuting: s.field("excludeMuting", S.option(S.bool)),
+    excludeInactive: s.field("excludeInactive", S.option(S.bool)),
   })
 
 type postIExportFollowingResponse = unit
@@ -1018,7 +1018,7 @@ type postIImportFollowingRequest = {
 
 let postIImportFollowingRequestSchema = S.object(s => {
     fileId: s.field("fileId", S.string),
-    withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), None),
+    withReplies: s.field("withReplies", S.option(S.bool)),
   })
 
 type postIImportFollowingResponse = unit
@@ -1146,7 +1146,7 @@ type postIRegistryGetRequest = {
 let postIRegistryGetRequestSchema = S.object(s => {
     key: s.field("key", S.string),
     scope: s.field("scope", S.array(S.string->S.pattern(/^[a-zA-Z0-9_]+$/))),
-    domain: s.fieldOr("domain", S.nullableAsOption(S.string), None),
+    domain: s.field("domain", S.option(S.string)),
   })
 
 type postIRegistryGetResponse = dict<JSON.t>
@@ -1180,7 +1180,7 @@ type postIRegistryGetAllRequest = {
 
 let postIRegistryGetAllRequestSchema = S.object(s => {
     scope: s.field("scope", S.array(S.string->S.pattern(/^[a-zA-Z0-9_]+$/))),
-    domain: s.fieldOr("domain", S.nullableAsOption(S.string), None),
+    domain: s.field("domain", S.option(S.string)),
   })
 
 type postIRegistryGetAllResponse = dict<JSON.t>
@@ -1216,7 +1216,7 @@ type postIRegistryGetDetailRequest = {
 let postIRegistryGetDetailRequestSchema = S.object(s => {
     key: s.field("key", S.string),
     scope: s.field("scope", S.array(S.string->S.pattern(/^[a-zA-Z0-9_]+$/))),
-    domain: s.fieldOr("domain", S.nullableAsOption(S.string), None),
+    domain: s.field("domain", S.option(S.string)),
   })
 
 type postIRegistryGetDetailResponse = {
@@ -1256,7 +1256,7 @@ type postIRegistryKeysRequest = {
 
 let postIRegistryKeysRequestSchema = S.object(s => {
     scope: s.field("scope", S.array(S.string->S.pattern(/^[a-zA-Z0-9_]+$/))),
-    domain: s.fieldOr("domain", S.nullableAsOption(S.string), None),
+    domain: s.field("domain", S.option(S.string)),
   })
 
 type postIRegistryKeysResponse = array<string>
@@ -1290,7 +1290,7 @@ type postIRegistryKeysWithTypeRequest = {
 
 let postIRegistryKeysWithTypeRequestSchema = S.object(s => {
     scope: s.field("scope", S.array(S.string->S.pattern(/^[a-zA-Z0-9_]+$/))),
-    domain: s.fieldOr("domain", S.nullableAsOption(S.string), None),
+    domain: s.field("domain", S.option(S.string)),
   })
 
 type postIRegistryKeysWithTypeResponse = dict<JSON.t>
@@ -1326,7 +1326,7 @@ type postIRegistryRemoveRequest = {
 let postIRegistryRemoveRequestSchema = S.object(s => {
     key: s.field("key", S.string),
     scope: s.field("scope", S.array(S.string->S.pattern(/^[a-zA-Z0-9_]+$/))),
-    domain: s.fieldOr("domain", S.nullableAsOption(S.string), None),
+    domain: s.field("domain", S.option(S.string)),
   })
 
 type postIRegistryRemoveResponse = unit
@@ -1397,7 +1397,7 @@ let postIRegistrySetRequestSchema = S.object(s => {
     key: s.field("key", S.string->S.min(1)),
     value: s.field("value", S.json),
     scope: s.field("scope", S.array(S.string->S.pattern(/^[a-zA-Z0-9_]+$/))),
-    domain: s.fieldOr("domain", S.nullableAsOption(S.string), None),
+    domain: s.field("domain", S.option(S.string)),
   })
 
 type postIRegistrySetResponse = unit
@@ -1428,8 +1428,8 @@ type postIRevokeTokenRequest = {
 }
 
 let postIRevokeTokenRequestSchema = S.object(s => {
-    tokenId: s.fieldOr("tokenId", S.nullableAsOption(S.string), None),
-    token: s.fieldOr("token", S.nullableAsOption(S.string), None),
+    tokenId: s.field("tokenId", S.option(S.string)),
+    token: s.field("token", S.option(S.string)),
   })
 
 type postIRevokeTokenResponse = unit
@@ -1462,9 +1462,9 @@ type postISigninHistoryRequest = {
 }
 
 let postISigninHistoryRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
   })
 
 type postISigninHistoryResponse = array<MisskeyIoComponentSchemas.Signin.t>
@@ -1500,8 +1500,8 @@ type postIUpdateEmailRequest = {
 
 let postIUpdateEmailRequestSchema = S.object(s => {
     password: s.field("password", S.string),
-    email: s.fieldOr("email", S.nullableAsOption(S.string), None),
-    token: s.fieldOr("token", S.nullableAsOption(S.string), None),
+    email: s.field("email", S.option(S.string)),
+    token: s.field("token", S.option(S.string)),
   })
 
 type postIUpdateEmailResponse = MisskeyIoComponentSchemas.MeDetailed.t
@@ -1538,7 +1538,7 @@ type postPagePushRequest = {
 let postPagePushRequestSchema = S.object(s => {
     pageId: s.field("pageId", S.string),
     event: s.field("event", S.string),
-    var: s.fieldOr("var", S.nullableAsOption(S.json), None),
+    var: s.field("var", S.option(S.json)),
   })
 
 type postPagePushResponse = unit
@@ -1569,7 +1569,7 @@ type postReversiCancelMatchRequest = {
 }
 
 let postReversiCancelMatchRequestSchema = S.object(s => {
-    userId: s.fieldOr("userId", S.nullableAsOption(S.string), None),
+    userId: s.field("userId", S.option(S.string)),
   })
 
 type postReversiCancelMatchResponse = unit
@@ -1602,10 +1602,10 @@ type postReversiGamesRequest = {
 }
 
 let postReversiGamesRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    my: s.fieldOr("my", S.nullableAsOption(S.bool), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    my: s.field("my", S.option(S.bool)),
   })
 
 type postReversiGamesResponse = array<MisskeyIoComponentSchemas.ReversiGameLite.t>
@@ -1663,9 +1663,9 @@ type postReversiMatchRequest = {
 }
 
 let postReversiMatchRequestSchema = S.object(s => {
-    userId: s.fieldOr("userId", S.nullableAsOption(S.string), None),
-    noIrregularRules: s.fieldOr("noIrregularRules", S.nullableAsOption(S.bool), None),
-    multiple: s.fieldOr("multiple", S.nullableAsOption(S.bool), None),
+    userId: s.field("userId", S.option(S.string)),
+    noIrregularRules: s.field("noIrregularRules", S.option(S.bool)),
+    multiple: s.field("multiple", S.option(S.bool)),
   })
 
 type postReversiMatchResponse = dict<JSON.t>
@@ -1771,7 +1771,7 @@ type postReversiVerifyResponse = {
 
 let postReversiVerifyResponseSchema = S.object(s => {
     desynced: s.field("desynced", S.bool),
-    game: s.fieldOr("game", S.nullableAsOption(MisskeyIoComponentSchemas.ReversiGameDetailed.schema), None),
+    game: s.field("game", S.option(MisskeyIoComponentSchemas.ReversiGameDetailed.schema)),
   })
 
 /**

package/src/generated/misskey-io/api/MisskeyIoDrive.res

@@ -45,12 +45,12 @@ type postDriveFilesRequest = {
 }
 
 let postDriveFilesRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), None),
-    type_: s.fieldOr("type", S.nullableAsOption(S.string->S.pattern(/^[a-zA-Z\/\*-]+$/)), None),
-    sort: s.fieldOr("sort", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    folderId: s.field("folderId", S.option(S.string)),
+    type_: s.field("type", S.option(S.string->S.pattern(/^[a-zA-Z\/\*-]+$/))),
+    sort: s.field("sort", S.option(S.string)),
   })
 
 type postDriveFilesResponse = array<MisskeyIoComponentSchemas.DriveFile.t>
@@ -85,9 +85,9 @@ type postDriveFilesAttachedNotesRequest = {
 }
 
 let postDriveFilesAttachedNotesRequestSchema = S.object(s => {
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
     fileId: s.field("fileId", S.string),
   })
 
@@ -157,11 +157,11 @@ type postDriveFilesCreateRequest = {
 }
 
 let postDriveFilesCreateRequestSchema = S.object(s => {
-    folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), None),
-    name: s.fieldOr("name", S.nullableAsOption(S.string), None),
-    comment: s.fieldOr("comment", S.nullableAsOption(S.string->S.max(512)), None),
-    isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), None),
-    force: s.fieldOr("force", S.nullableAsOption(S.bool), None),
+    folderId: s.field("folderId", S.option(S.string)),
+    name: s.field("name", S.option(S.string)),
+    comment: s.field("comment", S.option(S.string->S.max(512))),
+    isSensitive: s.field("isSensitive", S.option(S.bool)),
+    force: s.field("force", S.option(S.bool)),
     file: s.field("file", S.string),
   })
 
@@ -226,7 +226,7 @@ type postDriveFilesFindRequest = {
 
 let postDriveFilesFindRequestSchema = S.object(s => {
     name: s.field("name", S.string),
-    folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), None),
+    folderId: s.field("folderId", S.option(S.string)),
   })
 
 type postDriveFilesFindResponse = array<MisskeyIoComponentSchemas.DriveFile.t>
@@ -291,8 +291,8 @@ type postDriveFilesShowRequest = {
 }
 
 let postDriveFilesShowRequestSchema = S.object(s => {
-    fileId: s.fieldOr("fileId", S.nullableAsOption(S.string), None),
-    url: s.fieldOr("url", S.nullableAsOption(S.string), None),
+    fileId: s.field("fileId", S.option(S.string)),
+    url: s.field("url", S.option(S.string)),
   })
 
 type postDriveFilesShowResponse = MisskeyIoComponentSchemas.DriveFile.t
@@ -329,10 +329,10 @@ type postDriveFilesUpdateRequest = {
 
 let postDriveFilesUpdateRequestSchema = S.object(s => {
     fileId: s.field("fileId", S.string),
-    folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), None),
-    name: s.fieldOr("name", S.nullableAsOption(S.string), None),
-    isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), None),
-    comment: s.fieldOr("comment", S.nullableAsOption(S.string->S.max(512)), None),
+    folderId: s.field("folderId", S.option(S.string)),
+    name: s.field("name", S.option(S.string)),
+    isSensitive: s.field("isSensitive", S.option(S.bool)),
+    comment: s.field("comment", S.option(S.string->S.max(512))),
   })
 
 type postDriveFilesUpdateResponse = MisskeyIoComponentSchemas.DriveFile.t
@@ -370,11 +370,11 @@ type postDriveFilesUploadFromUrlRequest = {
 
 let postDriveFilesUploadFromUrlRequestSchema = S.object(s => {
     url: s.field("url", S.string),
-    folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), None),
-    isSensitive: s.fieldOr("isSensitive", S.nullableAsOption(S.bool), None),
-    comment: s.fieldOr("comment", S.nullableAsOption(S.string->S.max(512)), None),
-    marker: s.fieldOr("marker", S.nullableAsOption(S.string), None),
-    force: s.fieldOr("force", S.nullableAsOption(S.bool), None),
+    folderId: s.field("folderId", S.option(S.string)),
+    isSensitive: s.field("isSensitive", S.option(S.bool)),
+    comment: s.field("comment", S.option(S.string->S.max(512))),
+    marker: s.field("marker", S.option(S.string)),
+    force: s.field("force", S.option(S.bool)),
   })
 
 type postDriveFilesUploadFromUrlResponse = unit
@@ -407,10 +407,10 @@ type postDriveFoldersRequest = {
 }
 
 let postDriveFoldersRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    folderId: s.fieldOr("folderId", S.nullableAsOption(S.string), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    folderId: s.field("folderId", S.option(S.string)),
   })
 
 type postDriveFoldersResponse = array<MisskeyIoComponentSchemas.DriveFolder.t>
@@ -443,8 +443,8 @@ type postDriveFoldersCreateRequest = {
 }
 
 let postDriveFoldersCreateRequestSchema = S.object(s => {
-    name: s.fieldOr("name", S.nullableAsOption(S.string->S.max(200)), None),
-    parentId: s.fieldOr("parentId", S.nullableAsOption(S.string), None),
+    name: s.field("name", S.option(S.string->S.max(200))),
+    parentId: s.field("parentId", S.option(S.string)),
   })
 
 type postDriveFoldersCreateResponse = MisskeyIoComponentSchemas.DriveFolder.t
@@ -508,7 +508,7 @@ type postDriveFoldersFindRequest = {
 
 let postDriveFoldersFindRequestSchema = S.object(s => {
     name: s.field("name", S.string),
-    parentId: s.fieldOr("parentId", S.nullableAsOption(S.string), None),
+    parentId: s.field("parentId", S.option(S.string)),
   })
 
 type postDriveFoldersFindResponse = array<MisskeyIoComponentSchemas.DriveFolder.t>
@@ -575,8 +575,8 @@ type postDriveFoldersUpdateRequest = {
 
 let postDriveFoldersUpdateRequestSchema = S.object(s => {
     folderId: s.field("folderId", S.string),
-    name: s.fieldOr("name", S.nullableAsOption(S.string->S.max(200)), None),
-    parentId: s.fieldOr("parentId", S.nullableAsOption(S.string), None),
+    name: s.field("name", S.option(S.string->S.max(200))),
+    parentId: s.field("parentId", S.option(S.string)),
   })
 
 type postDriveFoldersUpdateResponse = MisskeyIoComponentSchemas.DriveFolder.t
@@ -611,10 +611,10 @@ type postDriveStreamRequest = {
 }
 
 let postDriveStreamRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    type_: s.fieldOr("type", S.nullableAsOption(S.string->S.pattern(/^[a-zA-Z\/\*-]+$/)), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    type_: s.field("type", S.option(S.string->S.pattern(/^[a-zA-Z\/\*-]+$/))),
   })
 
 type postDriveStreamResponse = array<MisskeyIoComponentSchemas.DriveFile.t>

package/src/generated/misskey-io/api/MisskeyIoFederation.res

@@ -88,9 +88,9 @@ type postFederationFollowersRequest = {
 
 let postFederationFollowersRequestSchema = S.object(s => {
     host: s.field("host", S.string),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
   })
 
 type postFederationFollowersResponse = array<MisskeyIoComponentSchemas.Following.t>
@@ -126,9 +126,9 @@ type postFederationFollowingRequest = {
 
 let postFederationFollowingRequestSchema = S.object(s => {
     host: s.field("host", S.string),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
   })
 
 type postFederationFollowingResponse = array<MisskeyIoComponentSchemas.Following.t>
@@ -170,17 +170,17 @@ type getFederationInstancesRequest = {
 }
 
 let getFederationInstancesRequestSchema = S.object(s => {
-    host: s.fieldOr("host", S.nullableAsOption(S.string), None),
-    blocked: s.fieldOr("blocked", S.nullableAsOption(S.bool), None),
-    notResponding: s.fieldOr("notResponding", S.nullableAsOption(S.bool), None),
-    suspended: s.fieldOr("suspended", S.nullableAsOption(S.bool), None),
-    silenced: s.fieldOr("silenced", S.nullableAsOption(S.bool), None),
-    federating: s.fieldOr("federating", S.nullableAsOption(S.bool), None),
-    subscribing: s.fieldOr("subscribing", S.nullableAsOption(S.bool), None),
-    publishing: s.fieldOr("publishing", S.nullableAsOption(S.bool), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(30)), None),
-    offset: s.fieldOr("offset", S.nullableAsOption(S.int), None),
-    sort: s.fieldOr("sort", S.nullableAsOption(S.string), None),
+    host: s.field("host", S.option(S.string)),
+    blocked: s.field("blocked", S.option(S.bool)),
+    notResponding: s.field("notResponding", S.option(S.bool)),
+    suspended: s.field("suspended", S.option(S.bool)),
+    silenced: s.field("silenced", S.option(S.bool)),
+    federating: s.field("federating", S.option(S.bool)),
+    subscribing: s.field("subscribing", S.option(S.bool)),
+    publishing: s.field("publishing", S.option(S.bool)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(30))),
+    offset: s.field("offset", S.option(S.int)),
+    sort: s.field("sort", S.option(S.string)),
   })
 
 type getFederationInstancesResponse = array<MisskeyIoComponentSchemas.FederationInstance.t>
@@ -222,17 +222,17 @@ type postFederationInstancesRequest = {
 }
 
 let postFederationInstancesRequestSchema = S.object(s => {
-    host: s.fieldOr("host", S.nullableAsOption(S.string), None),
-    blocked: s.fieldOr("blocked", S.nullableAsOption(S.bool), None),
-    notResponding: s.fieldOr("notResponding", S.nullableAsOption(S.bool), None),
-    suspended: s.fieldOr("suspended", S.nullableAsOption(S.bool), None),
-    silenced: s.fieldOr("silenced", S.nullableAsOption(S.bool), None),
-    federating: s.fieldOr("federating", S.nullableAsOption(S.bool), None),
-    subscribing: s.fieldOr("subscribing", S.nullableAsOption(S.bool), None),
-    publishing: s.fieldOr("publishing", S.nullableAsOption(S.bool), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(30)), None),
-    offset: s.fieldOr("offset", S.nullableAsOption(S.int), None),
-    sort: s.fieldOr("sort", S.nullableAsOption(S.string), None),
+    host: s.field("host", S.option(S.string)),
+    blocked: s.field("blocked", S.option(S.bool)),
+    notResponding: s.field("notResponding", S.option(S.bool)),
+    suspended: s.field("suspended", S.option(S.bool)),
+    silenced: s.field("silenced", S.option(S.bool)),
+    federating: s.field("federating", S.option(S.bool)),
+    subscribing: s.field("subscribing", S.option(S.bool)),
+    publishing: s.field("publishing", S.option(S.bool)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(30))),
+    offset: s.field("offset", S.option(S.int)),
+    sort: s.field("sort", S.option(S.string)),
   })
 
 type postFederationInstancesResponse = array<MisskeyIoComponentSchemas.FederationInstance.t>
@@ -296,7 +296,7 @@ type getFederationStatsRequest = {
 }
 
 let getFederationStatsRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
   })
 
 type getFederationStatsResponse = {
@@ -338,7 +338,7 @@ type postFederationStatsRequest = {
 }
 
 let postFederationStatsRequestSchema = S.object(s => {
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
   })
 
 type postFederationStatsResponse = {
@@ -414,9 +414,9 @@ type postFederationUsersRequest = {
 
 let postFederationUsersRequestSchema = S.object(s => {
     host: s.field("host", S.string),
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
   })
 
 type postFederationUsersResponse = array<MisskeyIoComponentSchemas.UserDetailedNotMe.t>

package/src/generated/misskey-io/api/MisskeyIoFlash.res

@@ -18,7 +18,7 @@ let postFlashCreateRequestSchema = S.object(s => {
     summary: s.field("summary", S.string),
     script: s.field("script", S.string),
     permissions: s.field("permissions", S.array(S.string)),
-    visibility: s.fieldOr("visibility", S.nullableAsOption(S.string), None),
+    visibility: s.field("visibility", S.option(S.string)),
   })
 
 type postFlashCreateResponse = MisskeyIoComponentSchemas.Flash.t
@@ -51,8 +51,8 @@ type postFlashFeaturedRequest = {
 }
 
 let postFlashFeaturedRequestSchema = S.object(s => {
-    offset: s.fieldOr("offset", S.nullableAsOption(S.int->S.min(0)), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    offset: s.field("offset", S.option(S.int->S.min(0))),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
   })
 
 type postFlashFeaturedResponse = array<MisskeyIoComponentSchemas.Flash.t>
@@ -150,11 +150,11 @@ type postFlashUpdateRequest = {
 
 let postFlashUpdateRequestSchema = S.object(s => {
     flashId: s.field("flashId", S.string),
-    title: s.fieldOr("title", S.nullableAsOption(S.string), None),
-    summary: s.fieldOr("summary", S.nullableAsOption(S.string), None),
-    script: s.fieldOr("script", S.nullableAsOption(S.string), None),
-    permissions: s.fieldOr("permissions", S.nullableAsOption(S.array(S.string)), None),
-    visibility: s.fieldOr("visibility", S.nullableAsOption(S.string), None),
+    title: s.field("title", S.option(S.string)),
+    summary: s.field("summary", S.option(S.string)),
+    script: s.field("script", S.option(S.string)),
+    permissions: s.field("permissions", S.option(S.array(S.string))),
+    visibility: s.field("visibility", S.option(S.string)),
   })
 
 type postFlashUpdateResponse = unit

package/src/generated/misskey-io/api/MisskeyIoFollowing.res

@@ -12,7 +12,7 @@ type postFollowingCreateRequest = {
 
 let postFollowingCreateRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
-    withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), None),
+    withReplies: s.field("withReplies", S.option(S.bool)),
   })
 
 type postFollowingCreateResponse = MisskeyIoComponentSchemas.UserLite.t
@@ -172,9 +172,9 @@ type postFollowingRequestsListRequest = {
 }
 
 let postFollowingRequestsListRequestSchema = S.object(s => {
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
   })
 
 type postFollowingRequestsListResponse_1 = {
@@ -250,9 +250,9 @@ type postFollowingRequestsSentRequest = {
 }
 
 let postFollowingRequestsSentRequestSchema = S.object(s => {
-    sinceId: s.fieldOr("sinceId", S.nullableAsOption(S.string), None),
-    untilId: s.fieldOr("untilId", S.nullableAsOption(S.string), None),
-    limit: s.fieldOr("limit", S.nullableAsOption(S.int->S.min(1)->S.max(100)), None),
+    sinceId: s.field("sinceId", S.option(S.string)),
+    untilId: s.field("untilId", S.option(S.string)),
+    limit: s.field("limit", S.option(S.int->S.min(1)->S.max(100))),
   })
 
 type postFollowingRequestsSentResponse_1 = {
@@ -299,8 +299,8 @@ type postFollowingUpdateRequest = {
 
 let postFollowingUpdateRequestSchema = S.object(s => {
     userId: s.field("userId", S.string),
-    notify: s.fieldOr("notify", S.nullableAsOption(S.string), None),
-    withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), None),
+    notify: s.field("notify", S.option(S.string)),
+    withReplies: s.field("withReplies", S.option(S.bool)),
   })
 
 type postFollowingUpdateResponse = MisskeyIoComponentSchemas.UserLite.t
@@ -333,8 +333,8 @@ type postFollowingUpdateAllRequest = {
 }
 
 let postFollowingUpdateAllRequestSchema = S.object(s => {
-    notify: s.fieldOr("notify", S.nullableAsOption(S.string), None),
-    withReplies: s.fieldOr("withReplies", S.nullableAsOption(S.bool), None),
+    notify: s.field("notify", S.option(S.string)),
+    withReplies: s.field("withReplies", S.option(S.bool)),
   })
 
 type postFollowingUpdateAllResponse = unit