@crowi/api 2.0.0-alpha.0 → 2.0.0-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/hono/handlers/access-token.d.ts +55 -55
- package/dist/hono/handlers/activation.d.ts +27 -27
- package/dist/hono/handlers/admin/app.d.ts +26 -26
- package/dist/hono/handlers/admin/auth.d.ts +24 -24
- package/dist/hono/handlers/admin/mail.d.ts +30 -30
- package/dist/hono/handlers/admin/plugins.d.ts +112 -112
- package/dist/hono/handlers/admin/search.d.ts +21 -21
- package/dist/hono/handlers/admin/security.d.ts +24 -24
- package/dist/hono/handlers/admin/storage.d.ts +19 -19
- package/dist/hono/handlers/admin/users.d.ts +399 -281
- package/dist/hono/handlers/admin/users.js +28 -0
- package/dist/hono/handlers/admin/users.js.map +1 -1
- package/dist/hono/handlers/adminCrypto.d.ts +32 -32
- package/dist/hono/handlers/app.d.ts +12 -8
- package/dist/hono/handlers/app.js +42 -1
- package/dist/hono/handlers/app.js.map +1 -1
- package/dist/hono/handlers/attachment-stream.js +23 -0
- package/dist/hono/handlers/attachment-stream.js.map +1 -1
- package/dist/hono/handlers/attachment.d.ts +180 -180
- package/dist/hono/handlers/autocomplete.d.ts +45 -45
- package/dist/hono/handlers/backlink.d.ts +33 -33
- package/dist/hono/handlers/bookmark.d.ts +95 -95
- package/dist/hono/handlers/comment.d.ts +55 -55
- package/dist/hono/handlers/draft.d.ts +27 -27
- package/dist/hono/handlers/draft.js +10 -0
- package/dist/hono/handlers/draft.js.map +1 -1
- package/dist/hono/handlers/emailChange.d.ts +25 -25
- package/dist/hono/handlers/installer.d.ts +16 -16
- package/dist/hono/handlers/inviteAccept.d.ts +37 -37
- package/dist/hono/handlers/me.d.ts +92 -92
- package/dist/hono/handlers/notification.d.ts +94 -94
- package/dist/hono/handlers/oauth.d.ts +58 -58
- package/dist/hono/handlers/page-collab.d.ts +20 -20
- package/dist/hono/handlers/page-preview.d.ts +7 -7
- package/dist/hono/handlers/page.d.ts +575 -324
- package/dist/hono/handlers/page.js +123 -6
- package/dist/hono/handlers/page.js.map +1 -1
- package/dist/hono/handlers/passwordReset.d.ts +37 -37
- package/dist/hono/handlers/presence.d.ts +44 -44
- package/dist/hono/handlers/revision.d.ts +99 -99
- package/dist/hono/handlers/search.d.ts +64 -64
- package/dist/hono/handlers/tokenAuth.d.ts +80 -80
- package/dist/hono/handlers/user.d.ts +102 -102
- package/dist/hono/handlers/user.js +15 -5
- package/dist/hono/handlers/user.js.map +1 -1
- package/dist/hono/index.d.ts +94 -94
- package/dist/mcp/result.d.ts +52 -11
- package/dist/mcp/result.js +66 -1
- package/dist/mcp/result.js.map +1 -1
- package/dist/mcp/tools/page.js +30 -5
- package/dist/mcp/tools/page.js.map +1 -1
- package/dist/mcp/tools/search.d.ts +12 -0
- package/dist/mcp/tools/search.js +21 -5
- package/dist/mcp/tools/search.js.map +1 -1
- package/dist/migration/helpers.d.ts +13 -0
- package/dist/migration/helpers.js +29 -0
- package/dist/migration/helpers.js.map +1 -0
- package/dist/migration/migrations/files-url-to-attachments.d.ts +35 -0
- package/dist/migration/migrations/files-url-to-attachments.js +291 -0
- package/dist/migration/migrations/files-url-to-attachments.js.map +1 -0
- package/dist/migration/migrations/index.js +6 -0
- package/dist/migration/migrations/index.js.map +1 -1
- package/dist/migration/migrations/published-current-revision.d.ts +47 -0
- package/dist/migration/migrations/published-current-revision.js +90 -0
- package/dist/migration/migrations/published-current-revision.js.map +1 -0
- package/dist/migration/migrations/relocate-reserved-api-paths.d.ts +3 -0
- package/dist/migration/migrations/relocate-reserved-api-paths.js +135 -0
- package/dist/migration/migrations/relocate-reserved-api-paths.js.map +1 -0
- package/dist/migration/migrations/wikilink-format.d.ts +0 -11
- package/dist/migration/migrations/wikilink-format.js +5 -156
- package/dist/migration/migrations/wikilink-format.js.map +1 -1
- package/dist/migration/migrations/wikilink-html-recover.d.ts +116 -0
- package/dist/migration/migrations/wikilink-html-recover.js +314 -0
- package/dist/migration/migrations/wikilink-html-recover.js.map +1 -0
- package/dist/models/page.d.ts +3 -0
- package/dist/models/page.js +40 -2
- package/dist/models/page.js.map +1 -1
- package/dist/models/user.d.ts +1 -0
- package/dist/models/user.js +40 -21
- package/dist/models/user.js.map +1 -1
- package/dist/renderer/core/headings.d.ts +12 -1
- package/dist/renderer/core/headings.js +48 -8
- package/dist/renderer/core/headings.js.map +1 -1
- package/dist/renderer/pipeline.d.ts +6 -0
- package/dist/renderer/pipeline.js.map +1 -1
- package/dist/util/page-response.js +19 -2
- package/dist/util/page-response.js.map +1 -1
- package/dist/util/replace-url.d.ts +85 -0
- package/dist/util/replace-url.js +251 -0
- package/dist/util/replace-url.js.map +1 -0
- package/package.json +13 -5
- package/public/images/file-not-found.png +0 -0
- package/views/mail/activation.mjml +9 -0
- package/views/mail/activation.text +13 -0
- package/views/mail/adminApprovalPending.mjml +7 -0
- package/views/mail/adminApprovalPending.text +11 -0
- package/views/mail/emailChange.mjml +9 -0
- package/views/mail/emailChange.text +13 -0
- package/views/mail/invite.mjml +9 -0
- package/views/mail/invite.text +13 -0
- package/views/mail/layout.mjml +38 -0
- package/views/mail/passwordChanged.mjml +4 -0
- package/views/mail/passwordChanged.text +9 -0
- package/views/mail/passwordReset.mjml +9 -0
- package/views/mail/passwordReset.text +13 -0
- package/views/mail/test.mjml +2 -0
- package/views/mail/test.text +7 -0
- package/dist/common/functions/path2name.d.ts +0 -1
- package/dist/common/functions/path2name.js +0 -22
- package/dist/common/functions/path2name.js.map +0 -1
- package/dist/common/functions/renderIcon.d.ts +0 -1
- package/dist/common/functions/renderIcon.js +0 -9
- package/dist/common/functions/renderIcon.js.map +0 -1
- package/dist/controllers/admin.d.ts +0 -3
- package/dist/controllers/admin.js +0 -474
- package/dist/controllers/admin.js.map +0 -1
- package/dist/controllers/attachment.d.ts +0 -4
- package/dist/controllers/attachment.js +0 -200
- package/dist/controllers/attachment.js.map +0 -1
- package/dist/controllers/backlink.d.ts +0 -3
- package/dist/controllers/backlink.js +0 -42
- package/dist/controllers/backlink.js.map +0 -1
- package/dist/controllers/bookmark.d.ts +0 -3
- package/dist/controllers/bookmark.js +0 -100
- package/dist/controllers/bookmark.js.map +0 -1
- package/dist/controllers/comment.d.ts +0 -3
- package/dist/controllers/comment.js +0 -111
- package/dist/controllers/comment.js.map +0 -1
- package/dist/controllers/index.d.ts +0 -25
- package/dist/controllers/index.js +0 -44
- package/dist/controllers/index.js.map +0 -1
- package/dist/controllers/installer.d.ts +0 -3
- package/dist/controllers/installer.js +0 -48
- package/dist/controllers/installer.js.map +0 -1
- package/dist/controllers/login.d.ts +0 -4
- package/dist/controllers/login.js +0 -438
- package/dist/controllers/login.js.map +0 -1
- package/dist/controllers/logout.d.ts +0 -5
- package/dist/controllers/logout.js +0 -11
- package/dist/controllers/logout.js.map +0 -1
- package/dist/controllers/me.d.ts +0 -4
- package/dist/controllers/me.js +0 -369
- package/dist/controllers/me.js.map +0 -1
- package/dist/controllers/notification.d.ts +0 -3
- package/dist/controllers/notification.js +0 -88
- package/dist/controllers/notification.js.map +0 -1
- package/dist/controllers/page.d.ts +0 -3
- package/dist/controllers/page.js +0 -881
- package/dist/controllers/page.js.map +0 -1
- package/dist/controllers/revision.d.ts +0 -3
- package/dist/controllers/revision.js +0 -91
- package/dist/controllers/revision.js.map +0 -1
- package/dist/controllers/search.d.ts +0 -3
- package/dist/controllers/search.js +0 -93
- package/dist/controllers/search.js.map +0 -1
- package/dist/controllers/share.d.ts +0 -3
- package/dist/controllers/share.js +0 -207
- package/dist/controllers/share.js.map +0 -1
- package/dist/controllers/shareAccess.d.ts +0 -3
- package/dist/controllers/shareAccess.js +0 -28
- package/dist/controllers/shareAccess.js.map +0 -1
- package/dist/controllers/slack.d.ts +0 -3
- package/dist/controllers/slack.js +0 -87
- package/dist/controllers/slack.js.map +0 -1
- package/dist/controllers/tokenAuth.d.ts +0 -10
- package/dist/controllers/tokenAuth.js +0 -292
- package/dist/controllers/tokenAuth.js.map +0 -1
- package/dist/controllers/user.d.ts +0 -3
- package/dist/controllers/user.js +0 -67
- package/dist/controllers/user.js.map +0 -1
- package/dist/controllers/version.d.ts +0 -4
- package/dist/controllers/version.js +0 -19
- package/dist/controllers/version.js.map +0 -1
- package/dist/crowi/express-init.d.ts +0 -4
- package/dist/crowi/express-init.js +0 -101
- package/dist/crowi/express-init.js.map +0 -1
- package/dist/form/admin/app.d.ts +0 -2
- package/dist/form/admin/app.js +0 -9
- package/dist/form/admin/app.js.map +0 -1
- package/dist/form/admin/auth.d.ts +0 -2
- package/dist/form/admin/auth.js +0 -9
- package/dist/form/admin/auth.js.map +0 -1
- package/dist/form/admin/aws.d.ts +0 -2
- package/dist/form/admin/aws.js +0 -13
- package/dist/form/admin/aws.js.map +0 -1
- package/dist/form/admin/github.d.ts +0 -2
- package/dist/form/admin/github.js +0 -15
- package/dist/form/admin/github.js.map +0 -1
- package/dist/form/admin/google.d.ts +0 -2
- package/dist/form/admin/google.js +0 -13
- package/dist/form/admin/google.js.map +0 -1
- package/dist/form/admin/mail.d.ts +0 -2
- package/dist/form/admin/mail.js +0 -13
- package/dist/form/admin/mail.js.map +0 -1
- package/dist/form/admin/sec.d.ts +0 -2
- package/dist/form/admin/sec.js +0 -10
- package/dist/form/admin/sec.js.map +0 -1
- package/dist/form/admin/slackSetting.d.ts +0 -2
- package/dist/form/admin/slackSetting.js +0 -13
- package/dist/form/admin/slackSetting.js.map +0 -1
- package/dist/form/admin/userEdit.d.ts +0 -2
- package/dist/form/admin/userEdit.js +0 -9
- package/dist/form/admin/userEdit.js.map +0 -1
- package/dist/form/admin/userInvite.d.ts +0 -2
- package/dist/form/admin/userInvite.js +0 -9
- package/dist/form/admin/userInvite.js.map +0 -1
- package/dist/form/comment.d.ts +0 -2
- package/dist/form/comment.js +0 -9
- package/dist/form/comment.js.map +0 -1
- package/dist/form/index.d.ts +0 -25
- package/dist/form/index.js +0 -48
- package/dist/form/index.js.map +0 -1
- package/dist/form/invited.d.ts +0 -2
- package/dist/form/invited.js +0 -13
- package/dist/form/invited.js.map +0 -1
- package/dist/form/login.d.ts +0 -2
- package/dist/form/login.js +0 -11
- package/dist/form/login.js.map +0 -1
- package/dist/form/me/apiToken.d.ts +0 -2
- package/dist/form/me/apiToken.js +0 -9
- package/dist/form/me/apiToken.js.map +0 -1
- package/dist/form/me/password.d.ts +0 -2
- package/dist/form/me/password.js +0 -11
- package/dist/form/me/password.js.map +0 -1
- package/dist/form/me/user.d.ts +0 -2
- package/dist/form/me/user.js +0 -9
- package/dist/form/me/user.js.map +0 -1
- package/dist/form/register.d.ts +0 -2
- package/dist/form/register.js +0 -13
- package/dist/form/register.js.map +0 -1
- package/dist/form/revision.d.ts +0 -2
- package/dist/form/revision.js +0 -13
- package/dist/form/revision.js.map +0 -1
- package/dist/hono/handlers/admin/share.d.ts +0 -106
- package/dist/hono/handlers/admin/share.js +0 -55
- package/dist/hono/handlers/admin/share.js.map +0 -1
- package/dist/middlewares/accessTokenParser.d.ts +0 -4
- package/dist/middlewares/accessTokenParser.js +0 -29
- package/dist/middlewares/accessTokenParser.js.map +0 -1
- package/dist/middlewares/adminRequired.d.ts +0 -10
- package/dist/middlewares/adminRequired.js +0 -35
- package/dist/middlewares/adminRequired.js.map +0 -1
- package/dist/middlewares/applicationInstalled.d.ts +0 -3
- package/dist/middlewares/applicationInstalled.js +0 -20
- package/dist/middlewares/applicationInstalled.js.map +0 -1
- package/dist/middlewares/applicationNotInstalled.d.ts +0 -3
- package/dist/middlewares/applicationNotInstalled.js +0 -13
- package/dist/middlewares/applicationNotInstalled.js.map +0 -1
- package/dist/middlewares/basicAuth.d.ts +0 -4
- package/dist/middlewares/basicAuth.js +0 -23
- package/dist/middlewares/basicAuth.js.map +0 -1
- package/dist/middlewares/csrfVerify.d.ts +0 -4
- package/dist/middlewares/csrfVerify.js +0 -24
- package/dist/middlewares/csrfVerify.js.map +0 -1
- package/dist/middlewares/encodeSpace.d.ts +0 -3
- package/dist/middlewares/encodeSpace.js +0 -14
- package/dist/middlewares/encodeSpace.js.map +0 -1
- package/dist/middlewares/fileAccessRightOrLoginRequired.d.ts +0 -4
- package/dist/middlewares/fileAccessRightOrLoginRequired.js +0 -29
- package/dist/middlewares/fileAccessRightOrLoginRequired.js.map +0 -1
- package/dist/middlewares/index.d.ts +0 -16
- package/dist/middlewares/index.js +0 -30
- package/dist/middlewares/index.js.map +0 -1
- package/dist/middlewares/jwtAdminRequired.d.ts +0 -8
- package/dist/middlewares/jwtAdminRequired.js +0 -35
- package/dist/middlewares/jwtAdminRequired.js.map +0 -1
- package/dist/middlewares/jwtAuth.d.ts +0 -4
- package/dist/middlewares/jwtAuth.js +0 -104
- package/dist/middlewares/jwtAuth.js.map +0 -1
- package/dist/middlewares/loginChecker.d.ts +0 -4
- package/dist/middlewares/loginChecker.js +0 -32
- package/dist/middlewares/loginChecker.js.map +0 -1
- package/dist/middlewares/loginRequired.d.ts +0 -4
- package/dist/middlewares/loginRequired.js +0 -88
- package/dist/middlewares/loginRequired.js.map +0 -1
- package/dist/routes/admin.d.ts +0 -4
- package/dist/routes/admin.js +0 -17
- package/dist/routes/admin.js.map +0 -1
- package/dist/routes/api/admin.d.ts +0 -4
- package/dist/routes/api/admin.js +0 -37
- package/dist/routes/api/admin.js.map +0 -1
- package/dist/routes/api/attachment.d.ts +0 -4
- package/dist/routes/api/attachment.js +0 -19
- package/dist/routes/api/attachment.js.map +0 -1
- package/dist/routes/api/bookmark.d.ts +0 -4
- package/dist/routes/api/bookmark.js +0 -15
- package/dist/routes/api/bookmark.js.map +0 -1
- package/dist/routes/api/comment.d.ts +0 -4
- package/dist/routes/api/comment.js +0 -14
- package/dist/routes/api/comment.js.map +0 -1
- package/dist/routes/api/index.d.ts +0 -4
- package/dist/routes/api/index.js +0 -36
- package/dist/routes/api/index.js.map +0 -1
- package/dist/routes/api/like.d.ts +0 -4
- package/dist/routes/api/like.js +0 -13
- package/dist/routes/api/like.js.map +0 -1
- package/dist/routes/api/notification.d.ts +0 -4
- package/dist/routes/api/notification.js +0 -15
- package/dist/routes/api/notification.js.map +0 -1
- package/dist/routes/api/page.d.ts +0 -4
- package/dist/routes/api/page.js +0 -24
- package/dist/routes/api/page.js.map +0 -1
- package/dist/routes/api/revision.d.ts +0 -4
- package/dist/routes/api/revision.js +0 -14
- package/dist/routes/api/revision.js.map +0 -1
- package/dist/routes/api/share.d.ts +0 -4
- package/dist/routes/api/share.js +0 -16
- package/dist/routes/api/share.js.map +0 -1
- package/dist/routes/api/version.d.ts +0 -4
- package/dist/routes/api/version.js +0 -10
- package/dist/routes/api/version.js.map +0 -1
- package/dist/routes/index.d.ts +0 -4
- package/dist/routes/index.js +0 -71
- package/dist/routes/index.js.map +0 -1
- package/dist/routes/login.d.ts +0 -4
- package/dist/routes/login.js +0 -18
- package/dist/routes/login.js.map +0 -1
- package/dist/routes/me.d.ts +0 -4
- package/dist/routes/me.js +0 -24
- package/dist/routes/me.js.map +0 -1
- package/dist/routes/ts-rest/admin/app.d.ts +0 -4
- package/dist/routes/ts-rest/admin/app.js +0 -67
- package/dist/routes/ts-rest/admin/app.js.map +0 -1
- package/dist/routes/ts-rest/admin/auth.d.ts +0 -4
- package/dist/routes/ts-rest/admin/auth.js +0 -95
- package/dist/routes/ts-rest/admin/auth.js.map +0 -1
- package/dist/routes/ts-rest/admin/index.d.ts +0 -10
- package/dist/routes/ts-rest/admin/index.js +0 -35
- package/dist/routes/ts-rest/admin/index.js.map +0 -1
- package/dist/routes/ts-rest/admin/mail.d.ts +0 -4
- package/dist/routes/ts-rest/admin/mail.js +0 -156
- package/dist/routes/ts-rest/admin/mail.js.map +0 -1
- package/dist/routes/ts-rest/admin/plugins.d.ts +0 -4
- package/dist/routes/ts-rest/admin/plugins.js +0 -317
- package/dist/routes/ts-rest/admin/plugins.js.map +0 -1
- package/dist/routes/ts-rest/admin/search.d.ts +0 -4
- package/dist/routes/ts-rest/admin/search.js +0 -67
- package/dist/routes/ts-rest/admin/search.js.map +0 -1
- package/dist/routes/ts-rest/admin/security.d.ts +0 -4
- package/dist/routes/ts-rest/admin/security.js +0 -114
- package/dist/routes/ts-rest/admin/security.js.map +0 -1
- package/dist/routes/ts-rest/admin/share.d.ts +0 -4
- package/dist/routes/ts-rest/admin/share.js +0 -69
- package/dist/routes/ts-rest/admin/share.js.map +0 -1
- package/dist/routes/ts-rest/admin/storage.d.ts +0 -4
- package/dist/routes/ts-rest/admin/storage.js +0 -59
- package/dist/routes/ts-rest/admin/storage.js.map +0 -1
- package/dist/routes/ts-rest/admin/users.d.ts +0 -4
- package/dist/routes/ts-rest/admin/users.js +0 -215
- package/dist/routes/ts-rest/admin/users.js.map +0 -1
- package/dist/routes/ts-rest/adminCrypto.d.ts +0 -4
- package/dist/routes/ts-rest/adminCrypto.js +0 -111
- package/dist/routes/ts-rest/adminCrypto.js.map +0 -1
- package/dist/routes/ts-rest/app.d.ts +0 -4
- package/dist/routes/ts-rest/app.js +0 -23
- package/dist/routes/ts-rest/app.js.map +0 -1
- package/dist/routes/ts-rest/attachment.d.ts +0 -4
- package/dist/routes/ts-rest/attachment.js +0 -830
- package/dist/routes/ts-rest/attachment.js.map +0 -1
- package/dist/routes/ts-rest/auth.d.ts +0 -4
- package/dist/routes/ts-rest/auth.js +0 -70
- package/dist/routes/ts-rest/auth.js.map +0 -1
- package/dist/routes/ts-rest/autocomplete.d.ts +0 -30
- package/dist/routes/ts-rest/autocomplete.js +0 -189
- package/dist/routes/ts-rest/autocomplete.js.map +0 -1
- package/dist/routes/ts-rest/backlink.d.ts +0 -4
- package/dist/routes/ts-rest/backlink.js +0 -106
- package/dist/routes/ts-rest/backlink.js.map +0 -1
- package/dist/routes/ts-rest/bookmark.d.ts +0 -4
- package/dist/routes/ts-rest/bookmark.js +0 -189
- package/dist/routes/ts-rest/bookmark.js.map +0 -1
- package/dist/routes/ts-rest/comment.d.ts +0 -4
- package/dist/routes/ts-rest/comment.js +0 -217
- package/dist/routes/ts-rest/comment.js.map +0 -1
- package/dist/routes/ts-rest/draft.d.ts +0 -22
- package/dist/routes/ts-rest/draft.js +0 -200
- package/dist/routes/ts-rest/draft.js.map +0 -1
- package/dist/routes/ts-rest/index.d.ts +0 -4
- package/dist/routes/ts-rest/index.js +0 -103
- package/dist/routes/ts-rest/index.js.map +0 -1
- package/dist/routes/ts-rest/installer.d.ts +0 -4
- package/dist/routes/ts-rest/installer.js +0 -77
- package/dist/routes/ts-rest/installer.js.map +0 -1
- package/dist/routes/ts-rest/me.d.ts +0 -4
- package/dist/routes/ts-rest/me.js +0 -410
- package/dist/routes/ts-rest/me.js.map +0 -1
- package/dist/routes/ts-rest/notification.d.ts +0 -4
- package/dist/routes/ts-rest/notification.js +0 -241
- package/dist/routes/ts-rest/notification.js.map +0 -1
- package/dist/routes/ts-rest/page-collab.d.ts +0 -29
- package/dist/routes/ts-rest/page-collab.js +0 -90
- package/dist/routes/ts-rest/page-collab.js.map +0 -1
- package/dist/routes/ts-rest/page-preview.d.ts +0 -26
- package/dist/routes/ts-rest/page-preview.js +0 -80
- package/dist/routes/ts-rest/page-preview.js.map +0 -1
- package/dist/routes/ts-rest/page.d.ts +0 -4
- package/dist/routes/ts-rest/page.js +0 -676
- package/dist/routes/ts-rest/page.js.map +0 -1
- package/dist/routes/ts-rest/presence.d.ts +0 -30
- package/dist/routes/ts-rest/presence.js +0 -155
- package/dist/routes/ts-rest/presence.js.map +0 -1
- package/dist/routes/ts-rest/revision.d.ts +0 -4
- package/dist/routes/ts-rest/revision.js +0 -240
- package/dist/routes/ts-rest/revision.js.map +0 -1
- package/dist/routes/ts-rest/search.d.ts +0 -4
- package/dist/routes/ts-rest/search.js +0 -121
- package/dist/routes/ts-rest/search.js.map +0 -1
- package/dist/routes/ts-rest/tokenAuth.d.ts +0 -4
- package/dist/routes/ts-rest/tokenAuth.js +0 -94
- package/dist/routes/ts-rest/tokenAuth.js.map +0 -1
- package/dist/routes/ts-rest/user.d.ts +0 -4
- package/dist/routes/ts-rest/user.js +0 -307
- package/dist/routes/ts-rest/user.js.map +0 -1
- package/dist/types/express.d.ts +0 -34
- package/dist/types/express.js +0 -50
- package/dist/types/express.js.map +0 -1
- package/dist/util/accessTokenParser.d.ts +0 -1
- package/dist/util/accessTokenParser.js +0 -34
- package/dist/util/accessTokenParser.js.map +0 -1
- package/dist/util/apiPaginate.d.ts +0 -11
- package/dist/util/apiPaginate.js +0 -33
- package/dist/util/apiPaginate.js.map +0 -1
- package/dist/util/apiResponse.d.ts +0 -9
- package/dist/util/apiResponse.js +0 -23
- package/dist/util/apiResponse.js.map +0 -1
- package/dist/util/auth.d.ts +0 -11
- package/dist/util/auth.js +0 -48
- package/dist/util/auth.js.map +0 -1
- package/dist/util/aws-config-migration.d.ts +0 -11
- package/dist/util/aws-config-migration.js +0 -68
- package/dist/util/aws-config-migration.js.map +0 -1
- package/dist/util/formUtil.d.ts +0 -2
- package/dist/util/formUtil.js +0 -15
- package/dist/util/formUtil.js.map +0 -1
- package/dist/util/githubAuth.d.ts +0 -2
- package/dist/util/githubAuth.js +0 -82
- package/dist/util/githubAuth.js.map +0 -1
- package/dist/util/googleAuth.d.ts +0 -2
- package/dist/util/googleAuth.js +0 -85
- package/dist/util/googleAuth.js.map +0 -1
- package/dist/util/mailer.d.ts +0 -7
- package/dist/util/mailer.js +0 -98
- package/dist/util/mailer.js.map +0 -1
- package/dist/util/page-status-migration.d.ts +0 -23
- package/dist/util/page-status-migration.js +0 -48
- package/dist/util/page-status-migration.js.map +0 -1
- package/dist/util/ssr.d.ts +0 -3
- package/dist/util/ssr.js +0 -9
- package/dist/util/ssr.js.map +0 -1
- package/dist/util/view.d.ts +0 -10
- package/dist/util/view.js +0 -99
- package/dist/util/view.js.map +0 -1
package/dist/models/user.js
CHANGED
|
@@ -551,10 +551,44 @@ exports.default = (crowi) => {
|
|
|
551
551
|
const user = await userData.save();
|
|
552
552
|
return { user, newPassword };
|
|
553
553
|
};
|
|
554
|
+
/**
|
|
555
|
+
* Issue a fresh invite token and send the invitation email for `user`.
|
|
556
|
+
*
|
|
557
|
+
* Shared by the initial invitation (`createUsersByInvitation`) and the
|
|
558
|
+
* admin "resend invite" action so the token issuance + invite-link
|
|
559
|
+
* assembly + `mailer.send('invite')` live in exactly one place. The
|
|
560
|
+
* token is a stateless JWT (`util/mail-token.ts`, TTL 7 days, not stored
|
|
561
|
+
* in the DB), so a resend simply signs a new token — no old-token
|
|
562
|
+
* invalidation is needed; the accept handler's status check rejects a
|
|
563
|
+
* second acceptance.
|
|
564
|
+
*
|
|
565
|
+
* Throws on a send failure. Callers that must not abort their wider
|
|
566
|
+
* operation (the batch invite, where one bad address must not stop the
|
|
567
|
+
* rest) wrap this in try/catch; the resend handler lets the throw
|
|
568
|
+
* surface so it can be mapped to a 5xx.
|
|
569
|
+
*/
|
|
570
|
+
userSchema.statics.sendInvitationMail = async function (user) {
|
|
571
|
+
const mailer = crowi.getMailer();
|
|
572
|
+
const mailTokenUtil = (0, mail_token_1.createMailTokenUtil)();
|
|
573
|
+
// Absolute base for the invite link (CLIENT_URL).
|
|
574
|
+
const baseUrl = crowi.getBaseUrl() || '';
|
|
575
|
+
// Token-based invite link — no plaintext password is ever emailed; the
|
|
576
|
+
// invitee sets their own credentials on accept.
|
|
577
|
+
const { token } = mailTokenUtil.signMailToken({
|
|
578
|
+
purpose: 'invite',
|
|
579
|
+
userId: user._id.toString(),
|
|
580
|
+
email: user.email,
|
|
581
|
+
});
|
|
582
|
+
const inviteUrl = `${baseUrl}/invite/accept?token=${token}`;
|
|
583
|
+
await mailer.send({
|
|
584
|
+
to: user.email,
|
|
585
|
+
htmlTemplate: 'invite',
|
|
586
|
+
vars: { ...mailer.brandVars(), inviteUrl, email: user.email },
|
|
587
|
+
});
|
|
588
|
+
};
|
|
554
589
|
userSchema.statics.createUsersByInvitation = function (emailList, toSendEmail, callback) {
|
|
555
590
|
const createdUserList = [];
|
|
556
591
|
const config = crowi.getConfig();
|
|
557
|
-
const mailer = crowi.getMailer();
|
|
558
592
|
if (!Array.isArray(emailList)) {
|
|
559
593
|
debug('emailList is not array');
|
|
560
594
|
}
|
|
@@ -598,31 +632,16 @@ exports.default = (crowi) => {
|
|
|
598
632
|
debug('error occured while iterate email list');
|
|
599
633
|
}
|
|
600
634
|
if (toSendEmail) {
|
|
601
|
-
const mailTokenUtil = (0, mail_token_1.createMailTokenUtil)();
|
|
602
|
-
const brand = mailer.brandVars();
|
|
603
|
-
// Absolute base for the invite link (CLIENT_URL).
|
|
604
|
-
const baseUrl = crowi.getBaseUrl() || '';
|
|
605
635
|
async_1.default.each(createdUserList, function (item, next) {
|
|
606
636
|
// Skip rows that already existed or failed to save.
|
|
607
637
|
if (!item.user) {
|
|
608
638
|
return next();
|
|
609
639
|
}
|
|
610
|
-
// Token
|
|
611
|
-
//
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
email: item.email,
|
|
616
|
-
});
|
|
617
|
-
const inviteUrl = `${baseUrl}/invite/accept?token=${token}`;
|
|
618
|
-
mailer
|
|
619
|
-
.send({
|
|
620
|
-
to: item.email,
|
|
621
|
-
htmlTemplate: 'invite',
|
|
622
|
-
vars: { ...brand, inviteUrl, email: item.email },
|
|
623
|
-
})
|
|
624
|
-
// A send failure must not abort user creation — log and
|
|
625
|
-
// continue so the remaining invitations still go out.
|
|
640
|
+
// Token issuance + invite-link assembly + send is shared with
|
|
641
|
+
// the admin "resend invite" action via `sendInvitationMail`.
|
|
642
|
+
// A send failure must not abort the batch — log and continue
|
|
643
|
+
// so the remaining invitations still go out.
|
|
644
|
+
User.sendInvitationMail(item.user)
|
|
626
645
|
.then(() => debug('completed to send invitation to', item.email))
|
|
627
646
|
.catch((err) => debug('failed to send invitation email: ', err))
|
|
628
647
|
.finally(() => next());
|
package/dist/models/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":";;;;;;AA2CA,8CAGC;AA7CD,uCAA0D;AAE1D,kDAA0B;AAC1B,oDAA4B;AAC5B,wDAA8B;AAC9B,kDAA0B;AAC1B,8CAAmG;AACnG,oDAA0D;AAC1D,kEAAiE;AAEjE,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,cAAc,GAAG,CAAC,CAAC;AACzB,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB;;;;;;;GAOG;AACU,QAAA,qBAAqB,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAW,CAAC;AAE5E;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,iBAAiB,CAAC,EAA0B;IAC1D,MAAM,MAAM,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC7B,OAAO,EAAE,QAAQ,EAAE,WAAW,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,MAAM,kBAAkB,EAAE,CAAC;AACvF,CAAC;AACD,MAAM,OAAO,GAAG,IAAI,CAAC;AACrB,MAAM,OAAO,GAAG,IAAI,CAAC;AACrB,8EAA8E;AAC9E,2EAA2E;AAC3E,0EAA0E;AAC1E,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACxC,MAAM,YAAY,GAAG,QAAQ,CAAC;AAC9B,MAAM,WAAW,GAAG,OAAO,CAAC;AAC5B,MAAM,UAAU,GAAG,MAAM,CAAC;AAC1B,MAAM,UAAU,GAAG,EAAE,CAAC;AA0GtB,kBAAe,CAAC,KAAY,EAAE,EAAE;IAC9B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,mBAAmB,CAAC,CAAC;IAEzC,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,IAAI,iBAAM,CAA0B;QACrD,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,MAAM;QAChB,QAAQ,EAAE,MAAM;QAChB,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE;QACnC,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QAC1B,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QAC9B,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;QACzC,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;YACxC,OAAO,EAAE,OAAO;SACjB;QACD,KAAK,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,UAAU,CAAC;YAC7C,OAAO,EAAE,YAAY;SACtB;QACD,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE;QAC7E,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE;QAC5C,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;QACrD,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;KAChD,CAAC,CAAC;IACH,IAAA,uCAAmB,EAAC,UAAU,CAAC,CAAC;IAEhC,6EAA6E;IAC7E,wEAAwE;IACxE,EAAE;IACF,sEAAsE;IACtE,6EAA6E;IAC7E,8EAA8E;IAC9E,0EAA0E;IAC1E,EAAE;IACF,gFAAgF;IAChF,uEAAuE;IACvE,8EAA8E;IAC9E,4EAA4E;IAC5E,EAAE;IACF,8EAA8E;IAC9E,6EAA6E;IAC7E,oEAAoE;IACpE,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,6BAAqB,EAAE,CAAC,CAAC;IACnF,UAAU,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,6BAAqB,EAAE,CAAC,CAAC;IAEpG,qEAAqE;IACrE,0EAA0E;IAC1E,uEAAuE;IACvE,sEAAsE;IACtE,wEAAwE;IACxE,wCAAwC;IACxC,EAAE;IACF,sEAAsE;IACtE,wEAAwE;IACxE,0EAA0E;IAC1E,kEAAkE;IAClE,8BAA8B;IAC9B,SAAS,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,IAAkB,EAAE,EAAE;QAC/C,KAAK,CAAC,eAAe,CACnB,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACzD,KAAK,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAC;QACnD,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,SAAS,8BAA8B;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC,CAAC,cAAc;QACtC,CAAC;QAED,6CAA6C;QAC7C,QAAQ,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,EAAE,CAAC;YAClD,KAAK,MAAM,CAAC,+BAA+B;gBACzC,OAAO,aAAa,CAAC;YACvB,KAAK,MAAM,CAAC,qCAAqC,CAAC;YAClD,KAAK,MAAM,CAAC,iCAAiC,EAAE,KAAK;gBAClD,OAAO,iBAAiB,CAAC;YAC3B;gBACE,OAAO,aAAa,CAAC,CAAC,kBAAkB;QAC5C,CAAC;IACH,CAAC;IAED,SAAS,0BAA0B;QACjC,MAAM,KAAK,GAAG,oEAAoE,CAAC;QACnF,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,MAAM,GAAG,GAAG,EAAE,CAAC;QAEf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3D,QAAQ,IAAI,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,SAAS,sBAAsB,CAAC,QAAQ;QACtC,MAAM,MAAM,GAAG,gBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC;QAElD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,SAAS,oBAAoB,CAAC,QAAQ;QACpC,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,OAAO,kBAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACH,SAAS,YAAY,CAAC,IAAY;QAChC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,SAAS,iBAAiB;QACxB,MAAM,IAAI,GAAG;YACX,OAAO;YACP,OAAO;SACR,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qEAAqE;IACrE,4EAA4E;IAC5E,yEAAyE;IACzE,kDAAkD;IAClD,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,IAAI;QACvC,IAAI,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACtB,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,OAAO,CAAC,aAAa,GAAG;QACjC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,eAAe,GAAG,UAAU,QAAQ;QACrD,KAAK,CAAC,sCAAsC,EAAE,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;QAEzG,4CAA4C;QAC5C,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,OAAO,kBAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,CAAC;QAED,sEAAsE;QACtE,MAAM,SAAS,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QACnD,KAAK,CAAC,0BAA0B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjD,KAAK,CAAC,uCAAuC,EAAE,SAAS,CAAC,CAAC;QAC1D,KAAK,CAAC,wCAAwC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC;IACpC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,QAAQ;QACjD,sCAAsC;QACtC,IAAI,CAAC,QAAQ,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC/C,KAAK,CAAC,2BAA2B,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,UAAU,GAAG;QAC9B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,wEAAwE;IACxE,wEAAwE;IACxE,wEAAwE;IACxE,0EAA0E;IAC1E,2EAA2E;IAC3E,0EAA0E;IAC1E,SAAS,UAAU,CAAC,MAAwB,EAAE,QAAiB,EAAE,QAA6D;QAC5H,MAAM,CAAC,IAAI,CACT,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAwB,CAAC;QACtD,oEAAoE;QACpE,yEAAyE;QACzE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,QAAwB,CAAC,CAC1D,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,QAAQ,EAAE,QAAQ;QAC9D,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC3B,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,KAAK,EAAE,QAAQ;QACxD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,KAAK;QAC9C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,kBAAkB,GAAG,UAAU,IAAI,EAAE,KAAK;QAC3D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,QAAQ;QACjD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,QAAQ;QACpD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG;QAClC,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,QAAQ;QACpD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG;QAClC,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,uBAAuB,GAAG;QAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC;QAC7D,MAAM,QAAQ,GAAG,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC;QAC7D,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,oBAAoB,GAAG;QACxC,OAAO,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,yBAAyB,GAAG;QAC7C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,IAAA,+BAAsB,EAAC,MAAM,CAAC,IAAI,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;IAC/E,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,mBAAmB,GAAG,UAAU,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ;QACnF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAC5B,gEAAgE;QAChE,IAAI,CAAC,gBAAgB,GAAG,IAAI,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CACd,CAAC,QAAQ,EAAE,EAAE;YACX,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACtC,OAAO,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAA+B,CAAC,CACjE,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,eAAe,GAAG,UAAU,QAAQ;QACrD,KAAK,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,SAAS,GAAG,UAAU,QAAQ;QAC/C,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,QAAQ;QACpD,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAC5B,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CACd,CAAC,QAAQ,EAAE,EAAE;YACX,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACtC,OAAO,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAA+B,CAAC,CACjE,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,aAAa,GAAG,UAAU,QAAQ;QACnD,KAAK,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC;QAC/B,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACpD,mBAAmB;YACnB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;QACnB,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAClD,mBAAmB;YACnB,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC1D,mBAAmB;YACnB,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;QACtB,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,YAAY,GAAG,UAAU,QAAQ;QAClD,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,0EAA0E;QAC1E,4EAA4E;QAC5E,2EAA2E;QAC3E,4EAA4E;QAC5E,2CAA2C;QAC3C,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,eAAe,GAAG,KAAK;QACxC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IACzD,UAAU,CAAC,OAAO,CAAC,mBAAmB,GAAG;QACvC,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,UAAU,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;QACvC,UAAU,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC;QACrC,UAAU,CAAC,gBAAgB,CAAC,GAAG,WAAW,CAAC;QAC3C,UAAU,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;QACvC,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC;QAEpC,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,YAAY,GAAG,UAAU,KAAK;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAEjE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;aAC/B,IAAI,EAAE;aACN,WAAW,EAAE,CAAC;QACjB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAEtC,+EAA+E;QAC/E,sDAAsD;QACtD,2DAA2D;QAC3D,gEAAgE;QAChE,yEAAyE;QACzE,4EAA4E;QAC5E,0EAA0E;QAC1E,kBAAkB;QAClB,OAAO,SAAS,CAAC,IAAI,CAAC,UAAU,YAAY;YAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;iBACrC,IAAI,EAAE;iBACN,WAAW,EAAE,CAAC;YACjB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YACrC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzD,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,OAAO,MAAM,KAAK,KAAK,CAAC;YACjD,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,oBAAoB,GAAG,UAAU,aAAa;QAC/D,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAEhD,MAAM,IAAI,GAAG,aAAa,IAAI,EAAE,CAAC;QAEjC,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,SAAS,GAAG,UAAU,OAAO,EAAE,QAAQ;QACxD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;QAEzD,qEAAqE;QACrE,+BAA+B;QAC/B,IAAI,CAAC,IAAI,EAAE;aACR,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC;aACvB,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;aAC1B,IAAI,EAAE;aACN,IAAI,CACH,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,EACtC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,EAAE,CAAC,CACpC,CAAC;IACN,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,YAAY,GAAG,UAAU,OAAO,GAAG,EAAE;QACtD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC;QAC/C,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,EAAE;aACf,EAAE,CACD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACvB,CAAC,CAAC,CACH;aACA,MAAM,CAAC,MAAM,CAAC;aACd,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,GAAG,EAAE,OAAO,GAAG,EAAE;QAC7D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,aAAa,CAAC;QAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;aACpD,MAAM,CAAC,MAAM,CAAC;aACd,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,UAAU,GAAG,UAAU,QAAQ;QAChD,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;aACvB,IAAI,EAAE;aACN,IAAI,CACH,CAAC,MAAM,EAAE,EAAE;YACT,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzB,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,EAAE,CAAC,CACpC,CAAC;IACN,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,uBAAuB,GAAG,UAAU,OAAO,EAAE,KAAK,EAAE,QAAQ;QAC7E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;QAEtE,yEAAyE;QACzE,iEAAiE;QACjE,sEAAsE;QACtE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;YACnB,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC;YACvB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,UAAU;YAClC,IAAI;YACJ,kEAAkE;YAClE,kEAAkE;YAClE,+DAA+D;YAC/D,MAAM,EAAE,+BAA+B;SACxC,CAAC,CAAC,IAAI,CACL,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EAClC,CAAC,GAAG,EAAE,EAAE;YACN,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;YACnC,OAAO,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,sBAAsB,GAAG,UAAU,SAAS,EAAE,OAAO;QACtE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC;QACtC,MAAM,eAAe,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC,CAAC;QAEvF,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;QAEpD,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,EAAS,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,kBAAkB,GAAG,UAAU,QAAQ;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,kBAAkB,GAAG,UAAU,QAAQ;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,kBAAkB,GAAG,UAAU,QAAQ;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,eAAe,GAAG,UAAU,KAAK;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,0BAA0B,GAAG,KAAK,WAAW,KAAK,EAAE,QAAQ;QAC7E,wFAAwF;QACxF,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAC9D,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;QAEpG,IAAI,IAAI,EAAE,CAAC;YACT,KAAK,CAAC,yCAAyC,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,8DAA8D;QAC9D,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;QAChE,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzD,MAAM,OAAO,GAAG,kBAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,OAAO,EAAE,CAAC;gBACZ,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBACzC,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,sBAAsB,GAAG,KAAK,WAAW,QAAQ,EAAE,QAAQ;QAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QAED,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,KAAK,WAAW,KAAK,EAAE,QAAQ,EAAE,QAAQ;QAC3E,IAAI,WAAW,GAAG,IAAI,CAAC;QACvB,IAAI,cAAc,GAAG,IAAI,CAAC;QAC1B,IAAI,QAAQ,GAAwB,IAAI,CAAC;QAEzC,iBAAiB;QACjB,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5C,IAAI,QAAQ,EAAE,CAAC;YACb,cAAc,GAAG,KAAK,CAAC;QACzB,CAAC;QAED,cAAc;QACd,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACzC,IAAI,QAAQ,EAAE,CAAC;YACb,WAAW,GAAG,KAAK,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,WAAW,IAAI,CAAC,cAAc,EAAE,CAAC;YACpC,OAAO,QAAQ,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,OAAO,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,oBAAoB,GAAG,UAAU,EAAE,EAAE,QAAQ;QAC9D,yEAAyE;QACzE,sEAAsE;QACtE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;aACd,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjB,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC9B,CAAC;YAED,KAAK,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;YAClC,sBAAsB;YACtB,yBAAyB;YACzB,IAAI,QAAQ,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;gBACvC,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,+DAA+D,CAAC,EAAE,IAAI,CAAC,CAAC;YACpG,CAAC;YAED,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,CAC9B,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,EACvB,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAAI,CAAC,CACtC,CAAC;QACJ,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,2BAA2B,GAAG,KAAK,WAAW,EAAE;QACjE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACpC,CAAC;QAED,qBAAqB;QACrB,oBAAoB;QACpB,MAAM,WAAW,GAAG,0BAA0B,EAAE,CAAC;QACjD,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEnC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC/B,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,uBAAuB,GAAG,UAAU,SAAS,EAAE,WAAW,EAAE,QAAQ;QACrF,MAAM,eAAe,GAIf,EAAE,CAAC;QACT,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAEjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAClC,CAAC;QAED,eAAK,CAAC,IAAI,CACR,SAAS,EACT,UAAU,KAAK,EAAE,IAAI;YACnB,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;YAC3B,IAAI,QAAQ,CAAC;YAEb,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;YAErB,cAAc;YACd,0BAA0B;YAC1B,iEAAiE;YACjE,iEAAiE;YACjE,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC;iBACpB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,qBAAqB;gBACrB,IAAI,IAAI,EAAE,CAAC;oBACT,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBAE5D,OAAO,IAAI,EAAE,CAAC;gBAChB,CAAC;gBAED,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;gBAEjD,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;gBACtB,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBAC9B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAS,CAAC;gBACtC,OAAO,CAAC,MAAM,GAAG,cAAc,CAAC;gBAEhC,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,CACxB,CAAC,KAAK,EAAE,EAAE;oBACR,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;oBACvD,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;oBACvB,IAAI,EAAE,CAAC;gBACT,CAAC,EACD,GAAG,EAAE;oBACH,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC5D,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;oBAC/B,IAAI,EAAE,CAAC;gBACT,CAAC,CACF,CAAC;YACJ,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5D,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;gBAC/B,IAAI,EAAE,CAAC;YACT,CAAC,CAAC,CAAC;QACP,CAAC,EACD,UAAU,GAAG;YACX,IAAI,GAAG,EAAE,CAAC;gBACR,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAClD,CAAC;YAED,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,aAAa,GAAG,IAAA,gCAAmB,GAAE,CAAC;gBAC5C,MAAM,KAAK,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC;gBACjC,kDAAkD;gBAClD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;gBAEzC,eAAK,CAAC,IAAI,CACR,eAAe,EACf,UAAU,IAAI,EAAE,IAAI;oBAClB,oDAAoD;oBACpD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;wBACf,OAAO,IAAI,EAAE,CAAC;oBAChB,CAAC;oBAED,0DAA0D;oBAC1D,6DAA6D;oBAC7D,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,aAAa,CAAC;wBAC5C,OAAO,EAAE,QAAQ;wBACjB,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;wBAChC,KAAK,EAAE,IAAI,CAAC,KAAK;qBAClB,CAAC,CAAC;oBACH,MAAM,SAAS,GAAG,GAAG,OAAO,wBAAwB,KAAK,EAAE,CAAC;oBAE5D,MAAM;yBACH,IAAI,CAAC;wBACJ,EAAE,EAAE,IAAI,CAAC,KAAK;wBACd,YAAY,EAAE,QAAQ;wBACtB,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;qBACjD,CAAC;wBACF,wDAAwD;wBACxD,sDAAsD;yBACrD,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;yBAChE,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;yBAC/D,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC3B,CAAC,EACD,UAAU,GAAG;oBACX,KAAK,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;gBACpD,CAAC,CACF,CAAC;YACJ,CAAC;YAED,KAAK,CAAC,qBAAqB,EAAE,eAAe,CAAC,CAAC;YAC9C,OAAO,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACzC,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,4BAA4B,GAAG,UAAU,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ;QACzG,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;QAE3B,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACpB,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC5B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;QACtB,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACpB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAS,CAAC;QACtC,OAAO,CAAC,MAAM,GAAG,8BAA8B,EAAE,CAAC;QAElD,kEAAkE;QAClE,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,CACjB,CAAC,QAAQ,EAAE,EAAE;YACX,IAAI,QAAQ,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;gBACrC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACxC,CAAC;YACD,OAAO,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAAI,CAAC,CACtC,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,yBAAyB,GAAG,UAAU,IAAI,EAAE,GAAG;QAChE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;QAEhB,OAAO,OAAO,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IAClC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,iBAAiB,GAAG,UAAU,IAAI;QACnD,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,CAAC;QACN,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC;YAC5C,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,gBAAK,EAA0B,MAAM,EAAE,UAAU,CAAC,CAAC;IAEhE,6BAA6B;IAC7B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC3C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACnC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IACzC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACrC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAE7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAEvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAE7B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/models/user.ts"],"names":[],"mappings":";;;;;;AA2CA,8CAGC;AA7CD,uCAA0D;AAE1D,kDAA0B;AAC1B,oDAA4B;AAC5B,wDAA8B;AAC9B,kDAA0B;AAC1B,8CAAmG;AACnG,oDAA0D;AAC1D,kEAAiE;AAEjE,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAM,aAAa,GAAG,CAAC,CAAC;AACxB,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAC3B,MAAM,cAAc,GAAG,CAAC,CAAC;AACzB,MAAM,cAAc,GAAG,CAAC,CAAC;AAEzB;;;;;;;GAOG;AACU,QAAA,qBAAqB,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAW,CAAC;AAE5E;;;;;;;;;;;;;;;GAeG;AACH,SAAgB,iBAAiB,CAAC,EAA0B;IAC1D,MAAM,MAAM,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;IAC7B,OAAO,EAAE,QAAQ,EAAE,WAAW,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,MAAM,kBAAkB,EAAE,CAAC;AACvF,CAAC;AACD,MAAM,OAAO,GAAG,IAAI,CAAC;AACrB,MAAM,OAAO,GAAG,IAAI,CAAC;AACrB,8EAA8E;AAC9E,2EAA2E;AAC3E,0EAA0E;AAC1E,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACxC,MAAM,YAAY,GAAG,QAAQ,CAAC;AAC9B,MAAM,WAAW,GAAG,OAAO,CAAC;AAC5B,MAAM,UAAU,GAAG,MAAM,CAAC;AAC1B,MAAM,UAAU,GAAG,EAAE,CAAC;AA2GtB,kBAAe,CAAC,KAAY,EAAE,EAAE;IAC9B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,mBAAmB,CAAC,CAAC;IAEzC,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,UAAU,GAAG,IAAI,iBAAM,CAA0B;QACrD,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,MAAM;QAChB,QAAQ,EAAE,MAAM;QAChB,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE;QACnC,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QAC1B,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QAC9B,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE;QACzC,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC;YACxC,OAAO,EAAE,OAAO;SACjB;QACD,KAAK,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,UAAU,CAAC;YAC7C,OAAO,EAAE,YAAY;SACtB;QACD,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE;QAC7E,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE;QAC5C,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;QACrD,gBAAgB,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;KAChD,CAAC,CAAC;IACH,IAAA,uCAAmB,EAAC,UAAU,CAAC,CAAC;IAEhC,6EAA6E;IAC7E,wEAAwE;IACxE,EAAE;IACF,sEAAsE;IACtE,6EAA6E;IAC7E,8EAA8E;IAC9E,0EAA0E;IAC1E,EAAE;IACF,gFAAgF;IAChF,uEAAuE;IACvE,8EAA8E;IAC9E,4EAA4E;IAC5E,EAAE;IACF,8EAA8E;IAC9E,6EAA6E;IAC7E,oEAAoE;IACpE,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,6BAAqB,EAAE,CAAC,CAAC;IACnF,UAAU,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,6BAAqB,EAAE,CAAC,CAAC;IAEpG,qEAAqE;IACrE,0EAA0E;IAC1E,uEAAuE;IACvE,sEAAsE;IACtE,wEAAwE;IACxE,wCAAwC;IACxC,EAAE;IACF,sEAAsE;IACtE,wEAAwE;IACxE,0EAA0E;IAC1E,kEAAkE;IAClE,8BAA8B;IAC9B,SAAS,CAAC,EAAE,CAAC,WAAW,EAAE,CAAC,IAAkB,EAAE,EAAE;QAC/C,KAAK,CAAC,eAAe,CACnB,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACzD,KAAK,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAC;QACnD,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,SAAS,8BAA8B;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAEjC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClB,OAAO,aAAa,CAAC,CAAC,cAAc;QACtC,CAAC;QAED,6CAA6C;QAC7C,QAAQ,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,EAAE,CAAC;YAClD,KAAK,MAAM,CAAC,+BAA+B;gBACzC,OAAO,aAAa,CAAC;YACvB,KAAK,MAAM,CAAC,qCAAqC,CAAC;YAClD,KAAK,MAAM,CAAC,iCAAiC,EAAE,KAAK;gBAClD,OAAO,iBAAiB,CAAC;YAC3B;gBACE,OAAO,aAAa,CAAC,CAAC,kBAAkB;QAC5C,CAAC;IACH,CAAC;IAED,SAAS,0BAA0B;QACjC,MAAM,KAAK,GAAG,oEAAoE,CAAC;QACnF,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,MAAM,GAAG,GAAG,EAAE,CAAC;QAEf,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;YAC3D,QAAQ,IAAI,KAAK,CAAC,SAAS,CAAC,SAAS,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,SAAS,sBAAsB,CAAC,QAAQ;QACtC,MAAM,MAAM,GAAG,gBAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC;QAElD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED;;;OAGG;IACH,SAAS,oBAAoB,CAAC,QAAQ;QACpC,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,OAAO,kBAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACH,SAAS,YAAY,CAAC,IAAY;QAChC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,SAAS,iBAAiB;QACxB,MAAM,IAAI,GAAG;YACX,OAAO;YACP,OAAO;SACR,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qEAAqE;IACrE,4EAA4E;IAC5E,yEAAyE;IACzE,kDAAkD;IAClD,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,UAAU,IAAI;QACvC,IAAI,IAAI,CAAC,IAAI,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClD,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACtB,CAAC;QACD,IAAI,EAAE,CAAC;IACT,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,OAAO,CAAC,aAAa,GAAG;QACjC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,eAAe,GAAG,UAAU,QAAQ;QACrD,KAAK,CAAC,sCAAsC,EAAE,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;QAEzG,4CAA4C;QAC5C,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChC,OAAO,kBAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrD,CAAC;QAED,sEAAsE;QACtE,MAAM,SAAS,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QACnD,KAAK,CAAC,0BAA0B,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjD,KAAK,CAAC,uCAAuC,EAAE,SAAS,CAAC,CAAC;QAC1D,KAAK,CAAC,wCAAwC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC;IACpC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,QAAQ;QACjD,sCAAsC;QACtC,IAAI,CAAC,QAAQ,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC/C,KAAK,CAAC,2BAA2B,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,UAAU,GAAG;QAC9B,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,wEAAwE;IACxE,wEAAwE;IACxE,wEAAwE;IACxE,0EAA0E;IAC1E,2EAA2E;IAC3E,0EAA0E;IAC1E,SAAS,UAAU,CAAC,MAAwB,EAAE,QAAiB,EAAE,QAA6D;QAC5H,MAAM,CAAC,IAAI,CACT,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAwB,CAAC;QACtD,oEAAoE;QACpE,yEAAyE;QACzE,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,QAAwB,CAAC,CAC1D,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,QAAQ,EAAE,QAAQ;QAC9D,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC3B,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,KAAK,EAAE,QAAQ;QACxD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,KAAK;QAC9C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,kBAAkB,GAAG,UAAU,IAAI,EAAE,KAAK;QAC3D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,WAAW,GAAG,UAAU,QAAQ;QACjD,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,QAAQ;QACpD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG;QAClC,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,QAAQ;QACpD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC,IAAI,EAAE,CAAC;IACrB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG;QAClC,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,uBAAuB,GAAG;QAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,QAAQ,GAAG,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC;QAC7D,MAAM,QAAQ,GAAG,IAAA,2BAAkB,EAAC,MAAM,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC;QAC7D,MAAM,QAAQ,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,oBAAoB,GAAG;QACxC,OAAO,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;IAC5C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,yBAAyB,GAAG;QAC7C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,IAAA,+BAAsB,EAAC,MAAM,CAAC,IAAI,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;IAC/E,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,mBAAmB,GAAG,UAAU,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ;QACnF,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAC5B,gEAAgE;QAChE,IAAI,CAAC,gBAAgB,GAAG,IAAI,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CACd,CAAC,QAAQ,EAAE,EAAE;YACX,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACtC,OAAO,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAA+B,CAAC,CACjE,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,eAAe,GAAG,UAAU,QAAQ;QACrD,KAAK,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,SAAS,GAAG,UAAU,QAAQ;QAC/C,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,QAAQ;QACpD,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAC5B,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CACd,CAAC,QAAQ,EAAE,EAAE;YACX,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACtC,OAAO,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAA+B,CAAC,CACjE,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,aAAa,GAAG,UAAU,QAAQ;QACnD,KAAK,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,gBAAgB,CAAC;QAC/B,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACpD,mBAAmB;YACnB,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;QACnB,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;YAClD,mBAAmB;YACnB,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC1D,mBAAmB;YACnB,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC;QACtB,CAAC;QACD,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,YAAY,GAAG,UAAU,QAAQ;QAClD,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QACnB,0EAA0E;QAC1E,4EAA4E;QAC5E,2EAA2E;QAC3E,4EAA4E;QAC5E,2CAA2C;QAC3C,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC,QAAQ,CAAC;QACnC,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC1C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,eAAe,GAAG,KAAK;QACxC,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IACzD,UAAU,CAAC,OAAO,CAAC,mBAAmB,GAAG;QACvC,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,UAAU,CAAC,iBAAiB,CAAC,GAAG,MAAM,CAAC;QACvC,UAAU,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC;QACrC,UAAU,CAAC,gBAAgB,CAAC,GAAG,WAAW,CAAC;QAC3C,UAAU,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC;QACvC,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAAC;QAEpC,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,YAAY,GAAG,UAAU,KAAK;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;QAEjE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;aAC/B,IAAI,EAAE;aACN,WAAW,EAAE,CAAC;QACjB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;QAEtC,+EAA+E;QAC/E,sDAAsD;QACtD,2DAA2D;QAC3D,gEAAgE;QAChE,yEAAyE;QACzE,4EAA4E;QAC5E,0EAA0E;QAC1E,kBAAkB;QAClB,OAAO,SAAS,CAAC,IAAI,CAAC,UAAU,YAAY;YAC1C,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;iBACrC,IAAI,EAAE;iBACN,WAAW,EAAE,CAAC;YACjB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YACrC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;gBAAE,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzD,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,OAAO,MAAM,KAAK,KAAK,CAAC;YACjD,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,oBAAoB,GAAG,UAAU,aAAa;QAC/D,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAEhD,MAAM,IAAI,GAAG,aAAa,IAAI,EAAE,CAAC;QAEjC,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,SAAS,GAAG,UAAU,OAAO,EAAE,QAAQ;QACxD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;QAEzD,qEAAqE;QACrE,+BAA+B;QAC/B,IAAI,CAAC,IAAI,EAAE;aACR,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,CAAC;aACvB,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;aAC1B,IAAI,EAAE;aACN,IAAI,CACH,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,EACtC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,EAAE,CAAC,CACpC,CAAC;IACN,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,YAAY,GAAG,UAAU,OAAO,GAAG,EAAE;QACtD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC;QAC/C,IAAI,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QACjE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3B,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,CAAC;QAED,OAAO,IAAI,CAAC,IAAI,EAAE;aACf,EAAE,CACD,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACf,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;QACvB,CAAC,CAAC,CACH;aACA,MAAM,CAAC,MAAM,CAAC;aACd,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,UAAU,GAAG,EAAE,OAAO,GAAG,EAAE;QAC7D,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,aAAa,CAAC;QAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE9B,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;aACpD,MAAM,CAAC,MAAM,CAAC;aACd,IAAI,CAAC,IAAI,CAAC;aACV,IAAI,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,UAAU,GAAG,UAAU,QAAQ;QAChD,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;aACvB,IAAI,EAAE;aACN,IAAI,CACH,CAAC,MAAM,EAAE,EAAE;YACT,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzB,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,EAAE,CAAC,CACpC,CAAC;IACN,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,uBAAuB,GAAG,UAAU,OAAO,EAAE,KAAK,EAAE,QAAQ;QAC7E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC;QAEtE,yEAAyE;QACzE,iEAAiE;QACjE,sEAAsE;QACtE,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;YACnB,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC;YACvB,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,UAAU;YAClC,IAAI;YACJ,kEAAkE;YAClE,kEAAkE;YAClE,+DAA+D;YAC/D,MAAM,EAAE,+BAA+B;SACxC,CAAC,CAAC,IAAI,CACL,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EAClC,CAAC,GAAG,EAAE,EAAE;YACN,KAAK,CAAC,sBAAsB,EAAE,GAAG,CAAC,CAAC;YACnC,OAAO,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,sBAAsB,GAAG,UAAU,SAAS,EAAE,OAAO;QACtE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC;QACtC,MAAM,eAAe,GAAG,IAAI,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC,CAAC;QAEvF,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;QAEpD,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,GAAG,CAAC,EAAE,MAAM,EAAS,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,KAAK,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,kBAAkB,GAAG,UAAU,QAAQ;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,kBAAkB,GAAG,UAAU,QAAQ;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,kBAAkB,GAAG,UAAU,QAAQ;QACxD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3C,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,eAAe,GAAG,UAAU,KAAK;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,0BAA0B,GAAG,KAAK,WAAW,KAAK,EAAE,QAAQ;QAC7E,wFAAwF;QACxF,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAC9D,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,oBAAoB,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;QAEpG,IAAI,IAAI,EAAE,CAAC;YACT,KAAK,CAAC,yCAAyC,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,8DAA8D;QAC9D,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC;QAChE,IAAI,IAAI,IAAI,IAAI,CAAC,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzD,MAAM,OAAO,GAAG,kBAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,OAAO,EAAE,CAAC;gBACZ,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBACzC,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,sBAAsB,GAAG,KAAK,WAAW,QAAQ,EAAE,QAAQ;QAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAClD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;QAED,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,cAAc,GAAG,KAAK,WAAW,KAAK,EAAE,QAAQ,EAAE,QAAQ;QAC3E,IAAI,WAAW,GAAG,IAAI,CAAC;QACvB,IAAI,cAAc,GAAG,IAAI,CAAC;QAC1B,IAAI,QAAQ,GAAwB,IAAI,CAAC;QAEzC,iBAAiB;QACjB,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5C,IAAI,QAAQ,EAAE,CAAC;YACb,cAAc,GAAG,KAAK,CAAC;QACzB,CAAC;QAED,cAAc;QACd,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;QACzC,IAAI,QAAQ,EAAE,CAAC;YACb,WAAW,GAAG,KAAK,CAAC;QACtB,CAAC;QAED,IAAI,CAAC,WAAW,IAAI,CAAC,cAAc,EAAE,CAAC;YACpC,OAAO,QAAQ,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;QAC3E,CAAC;QAED,OAAO,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC5B,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,oBAAoB,GAAG,UAAU,EAAE,EAAE,QAAQ;QAC9D,yEAAyE;QACzE,sEAAsE;QACtE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;aACd,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACjB,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAC9B,CAAC;YAED,KAAK,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;YAClC,sBAAsB;YACtB,yBAAyB;YACzB,IAAI,QAAQ,CAAC,MAAM,KAAK,cAAc,EAAE,CAAC;gBACvC,OAAO,QAAQ,CAAC,IAAI,KAAK,CAAC,+DAA+D,CAAC,EAAE,IAAI,CAAC,CAAC;YACpG,CAAC;YAED,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,CAC9B,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,EACvB,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAAI,CAAC,CACtC,CAAC;QACJ,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,2BAA2B,GAAG,KAAK,WAAW,EAAE;QACjE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACpC,CAAC;QAED,qBAAqB;QACrB,oBAAoB;QACpB,MAAM,WAAW,GAAG,0BAA0B,EAAE,CAAC;QACjD,QAAQ,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAEnC,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC/B,CAAC,CAAC;IAEF;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,OAAO,CAAC,kBAAkB,GAAG,KAAK,WAAW,IAAkB;QACxE,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QACjC,MAAM,aAAa,GAAG,IAAA,gCAAmB,GAAE,CAAC;QAC5C,kDAAkD;QAClD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;QACzC,uEAAuE;QACvE,gDAAgD;QAChD,MAAM,EAAE,KAAK,EAAE,GAAG,aAAa,CAAC,aAAa,CAAC;YAC5C,OAAO,EAAE,QAAQ;YACjB,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;YAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,GAAG,OAAO,wBAAwB,KAAK,EAAE,CAAC;QAE5D,MAAM,MAAM,CAAC,IAAI,CAAC;YAChB,EAAE,EAAE,IAAI,CAAC,KAAK;YACd,YAAY,EAAE,QAAQ;YACtB,IAAI,EAAE,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE;SAC9D,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,uBAAuB,GAAG,UAAU,SAAS,EAAE,WAAW,EAAE,QAAQ;QACrF,MAAM,eAAe,GAIf,EAAE,CAAC;QACT,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;QAEjC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9B,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAClC,CAAC;QAED,eAAK,CAAC,IAAI,CACR,SAAS,EACT,UAAU,KAAK,EAAE,IAAI;YACnB,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;YAC3B,IAAI,QAAQ,CAAC;YAEb,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;YAErB,cAAc;YACd,0BAA0B;YAC1B,iEAAiE;YACjE,iEAAiE;YACjE,IAAI,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC;iBACpB,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,qBAAqB;gBACrB,IAAI,IAAI,EAAE,CAAC;oBACT,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBAE5D,OAAO,IAAI,EAAE,CAAC;gBAChB,CAAC;gBAED,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;gBAEjD,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;gBACtB,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;gBAC9B,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAS,CAAC;gBACtC,OAAO,CAAC,MAAM,GAAG,cAAc,CAAC;gBAEhC,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,CACxB,CAAC,KAAK,EAAE,EAAE;oBACR,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;oBACvD,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;oBACvB,IAAI,EAAE,CAAC;gBACT,CAAC,EACD,GAAG,EAAE;oBACH,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC5D,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;oBAC/B,IAAI,EAAE,CAAC;gBACT,CAAC,CACF,CAAC;YACJ,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5D,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;gBAC/B,IAAI,EAAE,CAAC;YACT,CAAC,CAAC,CAAC;QACP,CAAC,EACD,UAAU,GAAG;YACX,IAAI,GAAG,EAAE,CAAC;gBACR,KAAK,CAAC,wCAAwC,CAAC,CAAC;YAClD,CAAC;YAED,IAAI,WAAW,EAAE,CAAC;gBAChB,eAAK,CAAC,IAAI,CACR,eAAe,EACf,UAAU,IAAI,EAAE,IAAI;oBAClB,oDAAoD;oBACpD,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;wBACf,OAAO,IAAI,EAAE,CAAC;oBAChB,CAAC;oBAED,8DAA8D;oBAC9D,6DAA6D;oBAC7D,6DAA6D;oBAC7D,6CAA6C;oBAC7C,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;yBAC/B,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;yBAChE,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;yBAC/D,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC3B,CAAC,EACD,UAAU,GAAG;oBACX,KAAK,CAAC,qCAAqC,EAAE,GAAG,CAAC,CAAC;gBACpD,CAAC,CACF,CAAC;YACJ,CAAC;YAED,KAAK,CAAC,qBAAqB,EAAE,eAAe,CAAC,CAAC;YAC9C,OAAO,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QACzC,CAAC,CACF,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,4BAA4B,GAAG,UAAU,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ;QACzG,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC;QAE3B,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACpB,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC5B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;QACtB,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAC9B,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;QACpB,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAS,CAAC;QACtC,OAAO,CAAC,MAAM,GAAG,8BAA8B,EAAE,CAAC;QAElD,kEAAkE;QAClE,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,CACjB,CAAC,QAAQ,EAAE,EAAE;YACX,IAAI,QAAQ,CAAC,MAAM,IAAI,aAAa,EAAE,CAAC;gBACrC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;YACxC,CAAC;YACD,OAAO,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClC,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAY,EAAE,IAAI,CAAC,CACtC,CAAC;IACJ,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,yBAAyB,GAAG,UAAU,IAAI,EAAE,GAAG;QAChE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;QAEhB,OAAO,OAAO,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IAClC,CAAC,CAAC;IAEF,UAAU,CAAC,OAAO,CAAC,iBAAiB,GAAG,UAAU,IAAI;QACnD,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,CAAC;QACN,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,EAAE,CAAC;YAC5C,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,IAAA,gBAAK,EAA0B,MAAM,EAAE,UAAU,CAAC,CAAC;IAEhE,6BAA6B;IAC7B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;IAC3C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACnC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IACzC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACrC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;IACrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAE7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAEvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACjC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IAC/B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAE7B,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
|
@@ -5,7 +5,18 @@ import type { PipelineEsmDeps, PipelineMetadata } from '../pipeline';
|
|
|
5
5
|
* stamp each heading with a stable `data.hProperties.id` matching the
|
|
6
6
|
* anchor id (so SSR HTML downstream can use the same id).
|
|
7
7
|
*
|
|
8
|
-
*
|
|
8
|
+
* `meta.toc[].text` holds the RAW heading text (inline HTML included, as
|
|
9
|
+
* authored) — the stored data is never mutated and the web strips the inline
|
|
10
|
+
* HTML out of the label at DISPLAY time via the SAME `stripKnownHtmlTags`
|
|
11
|
+
* helper (shared from `@crowi/api-contract`). The anchor id, on the other
|
|
12
|
+
* hand, is slugged from the STRIPPED text so the in-page hash stays clean and
|
|
13
|
+
* `hProperties.id === '#' + anchorId` (the web jumps using `anchorId`, never a
|
|
14
|
+
* local slugger). Old pages render fine without any migration: their stored
|
|
15
|
+
* id/href stay mutually consistent, the label is cleaned at display, and a
|
|
16
|
+
* re-save upgrades the hash to the clean slug.
|
|
17
|
+
*
|
|
18
|
+
* github-slugger handles dedup (`-1`, `-2`, …) and CJK preservation; it is
|
|
19
|
+
* called exactly once per heading.
|
|
9
20
|
*
|
|
10
21
|
* The factory takes the ESM deps because `github-slugger` /
|
|
11
22
|
* `mdast-util-to-string` are ESM-only and cannot be statically
|
|
@@ -1,24 +1,64 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.makeRemarkHeadings = void 0;
|
|
4
|
+
const api_contract_1 = require("@crowi/api-contract");
|
|
5
|
+
/**
|
|
6
|
+
* True iff a string carries at least one character github-slugger keeps in a
|
|
7
|
+
* slug: a Unicode letter / number (CJK included), or `_` / `-` (preserved
|
|
8
|
+
* verbatim). A heading whose slug source matches NONE of these (emoji- or
|
|
9
|
+
* symbol-only, e.g. `🎉` / `#$%`) slugs to `''`, so we substitute a synthetic
|
|
10
|
+
* `'section'` input rather than stamp an empty anchor.
|
|
11
|
+
*/
|
|
12
|
+
const HAS_SLUGGABLE_CHARS = /[\p{L}\p{N}_-]/u;
|
|
4
13
|
const makeRemarkHeadings = (deps) => (metadata) => (tree) => {
|
|
5
14
|
const slugger = new deps.GithubSlugger();
|
|
6
15
|
walk(tree);
|
|
7
16
|
function walk(node) {
|
|
8
17
|
if (node.type === 'heading') {
|
|
9
18
|
const heading = node;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
19
|
+
// `mdast-util-to-string` defaults to `includeHtml: true`, so raw inline
|
|
20
|
+
// markup inside a heading (e.g. `### <font color="…">Workspace</font>`)
|
|
21
|
+
// is present in `raw`. We keep that RAW text as the stored TOC label —
|
|
22
|
+
// the web strips known HTML tags out at display time — but slug the
|
|
23
|
+
// anchor id from the STRIPPED text so the in-page hash is clean and
|
|
24
|
+
// matches the heading DOM id (`id == href`).
|
|
25
|
+
const raw = deps.mdastToString(heading).trim();
|
|
26
|
+
if (raw.length === 0)
|
|
27
|
+
return;
|
|
28
|
+
const stripped = (0, api_contract_1.stripKnownHtmlTags)(raw).trim();
|
|
29
|
+
// Text the anchor id is slugged from: the STRIPPED heading text when it
|
|
30
|
+
// has visible content, else the RAW text — an HTML-only heading
|
|
31
|
+
// (`### <br>`) strips to `''` but `<br>` still slugs to `br`, so the
|
|
32
|
+
// body heading is never given an empty id (the TOC entry is dropped
|
|
33
|
+
// below — no visible label to address).
|
|
34
|
+
const slugSource = stripped.length > 0 ? stripped : raw;
|
|
35
|
+
// A symbol/emoji-only heading (`## 🎉`) has NO slug-able characters, so
|
|
36
|
+
// `github-slugger.slug()` would return `''` → `id=""` / `href="#"`, a
|
|
37
|
+
// broken in-page jump. Feed the slugger a stable synthetic `'section'`
|
|
38
|
+
// input instead so it returns a non-empty id AND still dedups multiple
|
|
39
|
+
// such headings on the page (`section`, `section-1`, …). The synthetic
|
|
40
|
+
// is chosen as the INPUT (not a post-hoc fallback) so the slugger never
|
|
41
|
+
// registers an empty string — which would otherwise make the next
|
|
42
|
+
// empty-slug heading dedup to `-1` rather than `section-1`.
|
|
43
|
+
// `HAS_SLUGGABLE_CHARS` keeps `_` / `-` (which github-slugger preserves)
|
|
44
|
+
// out of the synthetic branch so non-emoji headings are untouched.
|
|
45
|
+
const anchorId = slugger.slug(HAS_SLUGGABLE_CHARS.test(slugSource) ? slugSource : 'section');
|
|
18
46
|
// Stamp the heading so any downstream SSR renderer (Phase 3)
|
|
19
47
|
// can use the same id without re-running a slugger.
|
|
20
48
|
const data = (heading.data ?? (heading.data = {}));
|
|
21
49
|
data.hProperties = { ...(data.hProperties ?? {}), id: anchorId };
|
|
50
|
+
// Push a TOC entry only when there is a visible (post-strip) label.
|
|
51
|
+
// A heading that is only an *unknown* tag-like token (`### <int>`)
|
|
52
|
+
// keeps `<int>` as its label and is kept; an HTML-only heading
|
|
53
|
+
// (`### <br>`) collapses to nothing visible and is dropped.
|
|
54
|
+
if (stripped.length > 0) {
|
|
55
|
+
const entry = {
|
|
56
|
+
level: heading.depth,
|
|
57
|
+
text: raw,
|
|
58
|
+
anchorId,
|
|
59
|
+
};
|
|
60
|
+
metadata.toc.push(entry);
|
|
61
|
+
}
|
|
22
62
|
return;
|
|
23
63
|
}
|
|
24
64
|
if (Array.isArray(node.children)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headings.js","sourceRoot":"","sources":["../../../src/renderer/core/headings.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"headings.js","sourceRoot":"","sources":["../../../src/renderer/core/headings.ts"],"names":[],"mappings":";;;AACA,sDAAgF;AA4BhF;;;;;;GAMG;AACH,MAAM,mBAAmB,GAAG,iBAAiB,CAAC;AAEvC,MAAM,kBAAkB,GAC7B,CAAC,IAAqB,EAA0B,EAAE,CAClD,CAAC,QAAQ,EAAE,EAAE,CACb,CAAC,IAAI,EAAE,EAAE;IACP,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;IACzC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEX,SAAS,IAAI,CAAC,IAA6C;QACzD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC5B,MAAM,OAAO,GAAG,IAAe,CAAC;YAChC,wEAAwE;YACxE,wEAAwE;YACxE,uEAAuE;YACvE,oEAAoE;YACpE,oEAAoE;YACpE,6CAA6C;YAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;YAC/C,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO;YAC7B,MAAM,QAAQ,GAAG,IAAA,iCAAkB,EAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;YAChD,wEAAwE;YACxE,gEAAgE;YAChE,qEAAqE;YACrE,oEAAoE;YACpE,wCAAwC;YACxC,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;YACxD,wEAAwE;YACxE,sEAAsE;YACtE,uEAAuE;YACvE,uEAAuE;YACvE,uEAAuE;YACvE,wEAAwE;YACxE,kEAAkE;YAClE,4DAA4D;YAC5D,yEAAyE;YACzE,mEAAmE;YACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YAE7F,6DAA6D;YAC7D,oDAAoD;YACpD,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC,CAA8C,CAAC;YAChG,IAAI,CAAC,WAAW,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;YAEjE,oEAAoE;YACpE,mEAAmE;YACnE,+DAA+D;YAC/D,4DAA4D;YAC5D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,KAAK,GAAqB;oBAC9B,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,IAAI,EAAE,GAAG;oBACT,QAAQ;iBACT,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACjC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ;gBAAE,IAAI,CAAC,KAAgD,CAAC,CAAC;QAC5F,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AA7DS,QAAA,kBAAkB,sBA6D3B"}
|
|
@@ -46,6 +46,12 @@ export interface PipelineEsmDeps {
|
|
|
46
46
|
GithubSlugger: new () => {
|
|
47
47
|
slug(text: string): string;
|
|
48
48
|
};
|
|
49
|
+
/**
|
|
50
|
+
* `mdast-util-to-string`'s `toString`. Called with no options (default
|
|
51
|
+
* `includeHtml: true`), so the headings transform receives the raw heading
|
|
52
|
+
* markup and strips only *known* HTML tags itself (`stripKnownHtmlTags`),
|
|
53
|
+
* rather than asking `mdast-util-to-string` to blanket-drop any HTML node.
|
|
54
|
+
*/
|
|
49
55
|
mdastToString: (node: unknown) => string;
|
|
50
56
|
/**
|
|
51
57
|
* Pre-warmed shiki highlighter bound to a **dual theme** (`github-light`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../src/renderer/pipeline.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../src/renderer/pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,7 +105,18 @@ const computeRevisionRenderArtifactsAsync = async (crowi, storedMeta, storedAst,
|
|
|
105
105
|
// can omit it — dispatch then degrades to no-op and the `code` /
|
|
106
106
|
// `@[tag](url)` nodes survive as plain text.
|
|
107
107
|
const { metadata, renderedAst } = await crowi.getRenderer().runRender(body, { mode: 'read', pageId });
|
|
108
|
-
const
|
|
108
|
+
const fresh = pickStoredMeta((0, revision_1.metadataToRevisionMeta)(metadata));
|
|
109
|
+
// Tie the toc source to the AST source. When the stored AST is fresh
|
|
110
|
+
// (`astIsFresh`), we serve `storedAst` and keep the stored-wins merge
|
|
111
|
+
// byte-identical to today, so the toc's anchorIds stay aligned with the
|
|
112
|
+
// stored heading ids. When the AST is stale (version mismatch / absent), we
|
|
113
|
+
// serve the freshly RECOMPUTED `renderedAst`, whose heading ids are slugged
|
|
114
|
+
// from the STRIPPED heading text — so the served toc must ALSO be the
|
|
115
|
+
// recomputed one, or a pre-0.7.0 HTML-heading revision would ship a stale
|
|
116
|
+
// raw-derived `anchorId` that no longer matches any rendered heading `id`
|
|
117
|
+
// (broken TOC click / scroll-spy on exactly the `<font>` legacy content this
|
|
118
|
+
// feature targets). Other meta fields stay stored-wins either way.
|
|
119
|
+
const mergedMeta = astIsFresh ? { ...fresh, ...fromStored } : { ...fresh, ...fromStored, toc: fresh.toc };
|
|
109
120
|
return {
|
|
110
121
|
meta: Object.keys(mergedMeta).length > 0 ? mergedMeta : undefined,
|
|
111
122
|
renderedAst: astIsFresh ? storedAst : renderedAst,
|
|
@@ -145,7 +156,13 @@ const pageToResponse = (page, options = {}) => {
|
|
|
145
156
|
extended: pageObj.extended,
|
|
146
157
|
createdAt: (0, ts_rest_helpers_1.toISOStringOrNull)(pageObj.createdAt) || EPOCH_ISO,
|
|
147
158
|
updatedAt: (0, ts_rest_helpers_1.toISOStringOrNull)(pageObj.updatedAt) || undefined,
|
|
148
|
-
|
|
159
|
+
// latestRevision is a dynamic, non-schema property assigned by
|
|
160
|
+
// populatePageData (like likerCount / seenUsersCount below), so it must be
|
|
161
|
+
// read off `dynamic` — `toObject()` strips it. Reading it off `pageObj`
|
|
162
|
+
// (the toObject result) always yielded `undefined`, which made the web
|
|
163
|
+
// stale-revision banner (`latestRevision !== revision._id`) never fire when
|
|
164
|
+
// viewing a page at `?revision_id=` a past version.
|
|
165
|
+
latestRevision: dynamic.latestRevision ? (0, ts_rest_helpers_1.toStringId)(dynamic.latestRevision) : undefined,
|
|
149
166
|
likerCount: dynamic.likerCount,
|
|
150
167
|
seenUsersCount: dynamic.seenUsersCount,
|
|
151
168
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page-response.js","sourceRoot":"","sources":["../../src/util/page-response.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"page-response.js","sourceRoot":"","sources":["../../src/util/page-response.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
import type Crowi from '../crowi';
|
|
2
|
+
import type { ProgressReporter } from '../migration/types';
|
|
3
|
+
/** Result of a single pure body replacement. */
|
|
4
|
+
export interface ReplaceResult {
|
|
5
|
+
/** Rewritten body — returned by reference (=== input) when nothing matched. */
|
|
6
|
+
body: string;
|
|
7
|
+
/** Number of literal occurrences of `from` replaced. */
|
|
8
|
+
occurrences: number;
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* Literal, single-pass, global substring replacement. `from` is matched
|
|
12
|
+
* verbatim (no regex), so it is safe for URLs full of `/` `.` `?` etc.
|
|
13
|
+
* `from === to` / empty `from` are no-ops. Returns the input body by reference
|
|
14
|
+
* when there is nothing to change so callers can cheap-skip on `result.body === body`.
|
|
15
|
+
*/
|
|
16
|
+
export declare function replaceUrlInBody(body: string, from: string, to: string): ReplaceResult;
|
|
17
|
+
/** Verdict from the pre-flight argument safety check (§a guard). */
|
|
18
|
+
export interface ReplaceSafety {
|
|
19
|
+
/** Hard errors — abort regardless of `--force`. */
|
|
20
|
+
errors: string[];
|
|
21
|
+
/** Advisory warnings — print and continue. */
|
|
22
|
+
warnings: string[];
|
|
23
|
+
/** True when `--from` lacks an `http(s)://` scheme (prefix-collision risk → needs `--force`). */
|
|
24
|
+
bareHostFrom: boolean;
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Assess whether a `from`→`to` pair is safe to apply as a literal replace.
|
|
28
|
+
* Pure + exported so both the CLI and tests share one rule set.
|
|
29
|
+
*
|
|
30
|
+
* The headline risk of literal substring replace is silent prefix corruption:
|
|
31
|
+
* `from = "wiki.example.in"` is a prefix of `wiki.example.int`, so a bare host
|
|
32
|
+
* can mangle unrelated domains. We therefore flag scheme-less `from` (caller
|
|
33
|
+
* gates it behind `--force`) and reject empty / identical / too-short inputs.
|
|
34
|
+
*/
|
|
35
|
+
export declare function assessReplaceSafety(from: string, to: string): ReplaceSafety;
|
|
36
|
+
/** One previewed page that contains `from`. */
|
|
37
|
+
export interface ReplaceUrlSample {
|
|
38
|
+
path: string;
|
|
39
|
+
occurrences: number;
|
|
40
|
+
/** The first line containing `from`, trimmed/capped for display. */
|
|
41
|
+
snippet: string;
|
|
42
|
+
}
|
|
43
|
+
/** Scan result shown before any write (and the whole story for `--dry-run`). */
|
|
44
|
+
export interface ReplaceUrlPreview {
|
|
45
|
+
pagesMatched: number;
|
|
46
|
+
occurrences: number;
|
|
47
|
+
samples: ReplaceUrlSample[];
|
|
48
|
+
}
|
|
49
|
+
/** Final outcome surfaced to the CLI for the summary block + exit code. */
|
|
50
|
+
export interface ReplaceUrlSummary extends ReplaceUrlPreview {
|
|
51
|
+
from: string;
|
|
52
|
+
to: string;
|
|
53
|
+
dryRun: boolean;
|
|
54
|
+
/** True when a `confirm` hook declined the write. */
|
|
55
|
+
aborted: boolean;
|
|
56
|
+
pagesScanned: number;
|
|
57
|
+
pagesRewritten: number;
|
|
58
|
+
failed: number;
|
|
59
|
+
interrupted: boolean;
|
|
60
|
+
actingUserEmail?: string;
|
|
61
|
+
}
|
|
62
|
+
export interface ReplaceUrlOptions {
|
|
63
|
+
from: string;
|
|
64
|
+
to: string;
|
|
65
|
+
/** Email of the author recorded on the new revisions; defaults to the oldest admin. */
|
|
66
|
+
userEmail?: string;
|
|
67
|
+
dryRun?: boolean;
|
|
68
|
+
/** Include trashed / deprecated pages in addition to published (+ legacy null). */
|
|
69
|
+
includeTrash?: boolean;
|
|
70
|
+
concurrency?: number;
|
|
71
|
+
progress?: ProgressReporter;
|
|
72
|
+
/**
|
|
73
|
+
* Optional gate called once after the scan and before any write (never in
|
|
74
|
+
* dry-run). Return false to abort without writing. The CLI binds this to an
|
|
75
|
+
* interactive confirmation; tests omit it to write unconditionally.
|
|
76
|
+
*/
|
|
77
|
+
confirm?: (preview: ReplaceUrlPreview) => Promise<boolean>;
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Scan every in-scope page for `from`, optionally confirm, then quietly rewrite
|
|
81
|
+
* each match to `to`. Reuses `MigrationRunnerCore` purely for its public
|
|
82
|
+
* SIGINT-aware bounded-concurrency map (`mapBounded` / `installSigintHandler`);
|
|
83
|
+
* it never touches the migration audit log.
|
|
84
|
+
*/
|
|
85
|
+
export declare function runReplaceUrl(crowi: Crowi, opts: ReplaceUrlOptions): Promise<ReplaceUrlSummary>;
|