@geekity/cms 0.30.0 → 0.32.0

package/dist/admin/index.js

@@ -1,22 +1,30 @@
-export { ADMIN_ASSET_MAX_AGE, ADMIN_ASSET_PREFIX, ADMIN_STATIC_DIR, adminAssetResponse, findAdminAsset, } from './assets.js';
-export { countUsers, createUser, deleteUser, DuplicateUsernameError, findUser, findUserById, findUserByIdentifier, listUsers, primaryUser, migrateUsersToFile, cleanProfile, setUserEmail, setUserPassword, setUserProfile, setUserActorId, ConflictingActorIdError, UnknownUserError, USERS_FILE, USERS_FILE_MODE, usersFile, verifyUserPassword, } from './accounts.js';
+export { ADMIN_ASSET_MAX_AGE, ADMIN_STATIC_DIR, adminAssetResponse, findAdminAsset, } from './assets.js';
+export { ADMIN_ASSET_PREFIX } from '../site/admin-paths.js';
+export { countUsers, createUser, DuplicateUsernameError, findUser, findUserById, findUserByIdentifier, listUsers, primaryUser, cleanProfile, setUserEmail, setUserPassword, setUserProfile, setUserActorId, ConflictingActorIdError, UnknownUserError, USERS_FILE_MODE, usersFile, verifyUserPassword, } from '../site/users.js';
+export { deleteUser } from './users.js';
 export { credentialProblem, emailProblem, MAXIMUM_USERNAME_LENGTH, MINIMUM_PASSWORD_LENGTH, passwordProblem, USERNAME_PATTERN, usernameProblem, } from './credentials.js';
-export { blankForm, DOCUMENT_FILTERS, DOCUMENTS_PER_PAGE, documentFilter, editorPath, EXCLUDE_KEY, findBySlug, formFor, listingUrl, listOptionsFor, mountDocumentScreens, newEditorPath, PAGE_KIND, POST_KIND, returnPath, splitTags, } from './documents.js';
+export { DOCUMENT_FILTERS, DOCUMENTS_PER_PAGE, documentFilter, editorPath, findBySlug, listingUrl, listOptionsFor, mountDocumentScreens, newEditorPath, PAGE_SCREENS, POST_SCREENS, returnPath, } from './documents.js';
 export { applyTermChange, CATEGORY_KIND, deletePath, mountTaxonomyScreens, renamePath, renameProblem, rewriteTerm, TAG_KIND, TAXONOMY_FIELDS, TAXONOMY_KINDS, } from './taxonomy.js';
-export { actorSummary, deliveryRows, FEDERATION_FIELDS, FEDERATION_PATH, FEDERATION_RECENT, FEDERATION_SETTINGS_PATH, followerRow, INBOX_INTERACTIONS, inboxRows, localPosts, mountFederationScreen, RELAY_RETRY_PATH, RELAY_STATE_LABELS, relayRow, RESEND_PATH, resendMessage, } from './federation.js';
+export { actorSummary, deliveryRows, FEDERATION_FIELDS, FEDERATION_PATH, FEDERATION_RECENT, FEDERATION_SETTINGS_PATH, followerRow, INBOX_INTERACTIONS, inboxRows, localPosts, mountFederationScreen, RELAY_RETRY_PATH, RELAY_STATE_LABELS, relayRow, RESEND_ALL_PATH, RESEND_PATH, } from './federation.js';
 export { COMMENT_ACTIONS, COMMENT_ADMIN_FIELDS, COMMENT_TABS, COMMENTS_MODERATE_PATH, COMMENTS_PATH, COMMENTS_PER_PAGE, COMMENTS_REPLY_PATH, COMMENTS_SECTION, listUrl as commentListUrl, mountCommentsScreen, pendingComments, } from './comments.js';
 export { MESSAGE_FIELDS, MESSAGE_TABS, MESSAGES_DELETE_PATH, MESSAGES_PATH, MESSAGES_PER_PAGE, MESSAGES_READ_PATH, MESSAGES_SECTION, listUrl as messageListUrl, mountMessagesScreen, unreadMessages, } from './messages.js';
 export { flash, takeFlash } from './flash.js';
-export { deleteUpload, describeUpload, listUploads, MEDIA_DELETE_PATH, MEDIA_FIELDS, MEDIA_PATH, MEDIA_PER_PAGE, MEDIA_SECTION, MEDIA_UPLOAD_PATH, mediaPageUrl, mentionsUpload, mountMediaScreen, referencesTo, resolveUpload, } from './media.js';
+export { deleteUpload, describeUpload, listUploads, mentionsUpload, resolveUpload, } from '../media/library.js';
+export { MEDIA_DELETE_PATH, MEDIA_FIELDS, MEDIA_PATH, MEDIA_PER_PAGE, MEDIA_SECTION, MEDIA_UPLOAD_PATH, mediaPageUrl, mountMediaScreen, referencesTo, } from './media.js';
 export { formatInTimezone } from './formatting.js';
 export { adminContentSecurityPolicy, adminSecurityHeaders, baselineSecurityHeaders, createNonce, HSTS_MAX_AGE, HSTS_VALUE, NONCE_BYTES, } from './headers.js';
-export { clientAddress, createLoginThrottle, describeWait, LOCKOUT_GROWTH_LIMIT, loginKeys, } from './throttle.js';
+export { clientAddress, createLoginThrottle, describeWait, LOCKOUT_GROWTH_LIMIT, loginKeys, } from '../web/throttle.js';
 export { mountPreview, PREVIEW_PATH } from './preview.js';
-export { ARGON2_PARAMETERS, hashPassword, verifyPasswordHash } from './passwords.js';
-export { DASHBOARD_RECENT_POSTS, guard, LOGIN_PATH, LOGOUT_PATH, mountAdmin, postEditorPath, SETUP_PATH, } from './routes.js';
+export { ARGON2_PARAMETERS, hashPassword, verifyPasswordHash } from '../site/passwords.js';
+export { DASHBOARD_RECENT_POSTS, guard, LOGOUT_PATH, mountAdmin, postEditorPath, SETUP_PATH, } from './routes.js';
+export { LOGIN_PATH } from '../site/admin-paths.js';
 export { ADMIN_SECTIONS, adminMenu, UnknownAdminScreenError } from './menu.js';
-export { LANGUAGE_TAG_PATTERN, DEFAULT_SITE_SETTINGS, effectiveBaseUrl, EMAIL_PATTERN, formFromSettings, migrateSettingsToFile, readSiteSettings, SETTINGS_FIELD_NAMES, SETTINGS_FIELDS, SETTINGS_PATH, settingsFromForm, settingsFromSiteJson, settingsProblems, siteDataPath, normalizeRelayInbox, relayList, siteJsonFor, updateSiteSettings, writeSiteJson, } from './settings.js';
-export { bodyField, mountSettingsPage, settingsPagePath, settingsScreen } from './settings-page.js';
+export { LANGUAGE_TAG_PATTERN } from '../content/language.js';
+export { EMAIL_PATTERN, normalizeRelayInbox, relayList } from '../site/setting-values.js';
+export { DEFAULT_SITE_SETTINGS, effectiveBaseUrl } from '../site/settings.js';
+export { migrateActorKeysToFiles, migrateSettingsToFile, migrateUsersToFile, } from './legacy-migrations.js';
+export { SETTINGS_PATH } from './settings.js';
+export { mountSettingsPage, settingsPagePath, settingsScreen } from './settings-page.js';
 export { ALL_SETTINGS_PAGES, mountSettings, SETTINGS_PAGES } from './settings-pages.js';
 export { GENERAL_SETTINGS } from './settings-general.js';
 export { READING_SETTINGS } from './settings-reading.js';
@@ -25,10 +33,14 @@ export { AKISMET_FIELDS, AKISMET_PATH, AKISMET_REMOVE, akismetPanel, DISCUSSION_
 export { EMAIL_SETTINGS, MAIL_FIELDS, MAIL_PATH, MAIL_REMOVE, MAIL_TEST_FIELDS, MAIL_TEST_PATH, MAIL_TEST_TEMPLATE, mailPanel, } from './settings-email.js';
 export { PRIVACY_SETTINGS } from './settings-privacy.js';
 export { FEDERATION_SETTINGS } from './settings-federation.js';
-export { addUserProblems, changePasswordProblems, CHANGE_PASSWORD_PATH, deleteUserRefusal, DELETE_USER_PATH, generatePassword, GENERATED_PASSWORD_ALPHABET, GENERATED_PASSWORD_LENGTH, mountUsers, USER_EMAIL_PATH, USER_FIELDS, USERS_PATH, } from './users.js';
+export { addUserProblems, changePasswordProblems, CHANGE_PASSWORD_PATH, deleteUserRefusal, DELETE_USER_PATH, generatePassword, GENERATED_PASSWORD_ALPHABET, GENERATED_PASSWORD_LENGTH, mountUsers, USER_EMAIL_PATH, USER_FIELDS, } from './users.js';
+export { USERS_PATH } from '../site/admin-paths.js';
 export { FORGOT_PATH, mountRecovery, newPasswordProblem, PASSWORD_CHANGED_TEMPLATE, RECOVERY_ANSWER, RECOVERY_FIELDS, RESET_PATH, RESET_TEMPLATE, RESET_TOKEN_LIFETIME_SECONDS, resetLink, } from './recovery.js';
-export { ADMIN_PREFIX, clearSessionCookie, CSRF_FIELD, csrfTokenMatches, SECURE_SESSION_COOKIE, SESSION_COOKIE, sessionCookieName, sessionIdFrom, setSessionCookie, usesSecureCookies, } from './session.js';
-export { COMMENT_KINDS, COMMENT_SOURCES, COMMENT_STATUSES, DELIVERY_STATUSES, openAdminStore, RELAY_STATES, SESSION_ID_BYTES, } from './store.js';
+export { ADMIN_PREFIX } from '../site/admin-paths.js';
+export { clearSessionCookie, csrfTokenMatches, SECURE_SESSION_COOKIE, SESSION_COOKIE, sessionCookieName, sessionIdFrom, setSessionCookie, usesSecureCookies, } from '../web/session.js';
+export { CSRF_FIELD } from '../forms/protection.js';
+export { adminStoreOwning, COMMENT_KINDS, COMMENT_SOURCES, COMMENT_STATUSES, DELIVERY_STATUSES, openAdminDatabase, openAdminStore, RELAY_STATES, SESSION_ID_BYTES, } from '../store/admin-store.js';
 export { ADMIN_TEMPLATES, createAdminTemplateEnvironment, PACKAGED_ADMIN_DIR, } from './templates.js';
-export { mountUploads, refuseOversizedUpload, refusedUpload, storeUpload, tooLargeMessage, uploadMarkdown, UPLOAD_ENVELOPE_BYTES, UPLOAD_FIELD, UPLOADS_PATH, } from './uploads.js';
+export { mountUploads, refuseOversizedUpload, UPLOADS_PATH } from './uploads.js';
+export { refusedUpload, storeUpload, tooLargeMessage, uploadMarkdown, UPLOAD_ENVELOPE_BYTES, UPLOAD_FIELD, } from '../media/uploads.js';
 //# sourceMappingURL=index.js.map

package/dist/admin/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/admin/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/admin/index.ts"],"names":[],"mappings":"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"}

package/dist/{indieauth/consent.d.ts → admin/indieauth-consent.d.ts}

@@ -1,7 +1,7 @@
 import type { Hono } from 'hono';
-import type { AdminRender } from '../admin/documents.ts';
-import type { GeekityEnv } from '../env.ts';
-import type { Scope } from './request.ts';
+import type { AdminRender } from './documents.ts';
+import type { GeekityEnv } from '../web/env.ts';
+import type { Scope } from '../indieauth/request.ts';
 /**
  * Where the person approves or denies a sign-in. Under `/admin`, so the admin
  * guard signs them in first and checks the form's CSRF token.
@@ -25,4 +25,4 @@ export declare function mountAuthorizationEndpoint(app: Hono<GeekityEnv>): void;
 export declare function mountConsentScreen(app: Hono<GeekityEnv>, options: {
     render: AdminRender;
 }): void;
-//# sourceMappingURL=consent.d.ts.map
+//# sourceMappingURL=indieauth-consent.d.ts.map

package/dist/admin/indieauth-consent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"indieauth-consent.d.ts","sourceRoot":"","sources":["../../src/admin/indieauth-consent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGlD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAgBhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD;;;GAGG;AACH,eAAO,MAAM,YAAY,6BAAsC,CAAC;AAEhE,mGAAmG;AACnG,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAOxD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAyBtE;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAqHhG"}

package/dist/{indieauth/consent.js → admin/indieauth-consent.js}

@@ -1,14 +1,14 @@
-import { findUserById, listUsers } from '../admin/accounts.js';
-import { ADMIN_PREFIX } from '../admin/session.js';
-import { effectiveBaseUrl, readSiteSettings } from '../admin/settings.js';
-import { ADMIN_TEMPLATES } from '../admin/templates.js';
-import { isPrivateHost } from '../webmention/public-address.js';
-import { logAuthorizationRedemption, logAuthorizationRequest, noteActivity, } from './activity-log.js';
-import { fetchClientInformation, fetchClientLogo } from './client.js';
-import { AUTHORIZATION_PATH, authorizationServerMetadata } from './discovery.js';
-import { meForSignIn } from './identity.js';
-import { profileResponse, redeemCode, redemptionForm } from './redeem.js';
-import { parseAuthorizationRequest } from './request.js';
+import { ADMIN_PREFIX } from '../site/admin-paths.js';
+import { ADMIN_TEMPLATES } from './templates.js';
+import { findUserById, listUsers } from '../site/users.js';
+import { stringOrEmpty } from '../util/forms.js';
+import { isPrivateHost } from '../util/public-address.js';
+import { logAuthorizationRedemption, logAuthorizationRequest, noteActivity, } from '../web/indieauth-activity-log.js';
+import { fetchClientInformation, fetchClientLogo } from '../indieauth/client.js';
+import { AUTHORIZATION_PATH, authorizationServerMetadata } from '../web/indieauth-discovery.js';
+import { meForSignIn } from '../indieauth/identity.js';
+import { profileResponse, redeemCode, redemptionForm } from '../indieauth/redeem.js';
+import { parseAuthorizationRequest } from '../indieauth/request.js';
 /**
  * Where the person approves or denies a sign-in. Under `/admin`, so the admin
  * guard signs them in first and checks the form's CSRF token.
@@ -50,7 +50,7 @@ export function mountAuthorizationEndpoint(app) {
             return c.json({ error: 'invalid_grant', error_description: 'The person who approved this is gone.' }, 400);
         }
         noteActivity(c, { user: user.username });
-        const baseUrl = effectiveBaseUrl(config, readSiteSettings(config.contentDir));
+        const baseUrl = config.baseUrl;
         return c.json(profileResponse(grant, user, baseUrl));
     });
 }
@@ -67,9 +67,9 @@ export function mountConsentScreen(app, options) {
         const user = signedInUser(c);
         if (user === undefined)
             return c.redirect(ADMIN_PREFIX, 302);
-        const settings = readSiteSettings(config.contentDir);
-        const baseUrl = effectiveBaseUrl(config, settings);
-        const parsed = parseAuthorizationRequest(new URL(c.req.url).searchParams, baseUrl, settings.clientsWithoutPkce);
+        const settings = c.var.siteAtRequestStart;
+        const { baseUrl } = config;
+        const parsed = parseAuthorizationRequest(new URL(c.req.url).searchParams, baseUrl, settings.clients_without_pkce);
         if (parsed.kind === 'unredirectable')
             return refuse(c, parsed.message);
         const { clientId, redirectUri } = parsed.kind === 'valid' ? parsed.request : parsed;
@@ -127,16 +127,16 @@ export function mountConsentScreen(app, options) {
         if (user === undefined)
             return c.redirect(ADMIN_PREFIX, 302);
         const body = await c.req.parseBody({ all: true });
-        const pending = c.var.indieauth.consents.take(text(body['request']));
+        const pending = c.var.indieauth.consents.take(stringOrEmpty(body['request']));
         if (pending?.userId !== user.id) {
             return refuse(c, 'This sign-in was already answered or has expired. Start again from the app.');
         }
         const { request } = pending;
-        const baseUrl = effectiveBaseUrl(config, readSiteSettings(config.contentDir));
-        if (text(body['decision']) !== 'approve') {
+        const baseUrl = config.baseUrl;
+        if (stringOrEmpty(body['decision']) !== 'approve') {
             return c.redirect(answer(request.redirectUri, baseUrl, { error: 'access_denied', state: request.state }), 303);
         }
-        const ticked = new Set([body['scope']].flat().map(text));
+        const ticked = new Set([body['scope']].flat().map(stringOrEmpty));
         const code = c.var.indieauth.codes.put({
             clientId: request.clientId,
             ...(pending.clientName === undefined ? {} : { clientName: pending.clientName }),
@@ -186,7 +186,4 @@ function answer(redirectUri, baseUrl, fields) {
 function formActionSource(url) {
     return url.protocol === 'https:' || url.protocol === 'http:' ? url.origin : url.protocol;
 }
-function text(value) {
-    return typeof value === 'string' ? value : '';
-}
-//# sourceMappingURL=consent.js.map
+//# sourceMappingURL=indieauth-consent.js.map

package/dist/admin/indieauth-consent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"indieauth-consent.js","sourceRoot":"","sources":["../../src/admin/indieauth-consent.ts"],"names":[],"mappings":"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"}

package/dist/admin/job-status.d.ts

@@ -0,0 +1,25 @@
+import type { Context } from 'hono';
+import type { JobName, JobStateName, JobStatus, Json, Progress } from '../jobs/types.ts';
+import type { GeekityEnv } from '../web/env.ts';
+export interface JobStatusView {
+    readonly id: string;
+    readonly state: JobStateName;
+    readonly label: string;
+    readonly active: boolean;
+    readonly attempt: number;
+    readonly at: string;
+    readonly requeued: boolean;
+    readonly progress?: Progress;
+    readonly error?: string;
+}
+export declare function jobStatusView(status: JobStatus | undefined): JobStatusView | undefined;
+/**
+ * Queue a job from an admin form unless one of its name is active, say which
+ * happened, and send the browser back to the job's panel.
+ */
+export declare function queueJobFromForm<P extends Json>(c: Context<GeekityEnv>, job: JobName<P, Json>, payload: NoInfer<P>, replies: {
+    readonly panel: string;
+    readonly queued: string;
+    readonly busy: string;
+}): Promise<Response>;
+//# sourceMappingURL=job-status.d.ts.map

package/dist/admin/job-status.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-status.d.ts","sourceRoot":"","sources":["../../src/admin/job-status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAGhD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAUD,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,aAAa,GAAG,SAAS,CA8BtF;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,SAAS,IAAI,EACnD,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,GAAG,EAAE,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,EACrB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,OAAO,EAAE;IAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAClF,OAAO,CAAC,QAAQ,CAAC,CAKnB"}

package/dist/admin/job-status.js

@@ -0,0 +1,53 @@
+import { flash } from './flash.js';
+const LABELS = {
+    queued: 'Queued',
+    running: 'Running',
+    finished: 'Finished',
+    failed: 'Failed',
+    interrupted: 'Interrupted',
+};
+export function jobStatusView(status) {
+    if (status === undefined)
+        return undefined;
+    const common = {
+        id: status.id,
+        state: status.state,
+        label: LABELS[status.state],
+        active: status.state === 'queued' || status.state === 'running',
+        attempt: status.attempt,
+        requeued: false,
+    };
+    switch (status.state) {
+        case 'queued':
+            return {
+                ...common,
+                at: status.interruptedAt ?? status.queuedAt,
+                requeued: status.interruptedAt !== undefined,
+            };
+        case 'running':
+            return {
+                ...common,
+                at: status.startedAt,
+                ...(status.progress === undefined ? {} : { progress: status.progress }),
+            };
+        case 'finished':
+            return { ...common, at: status.finishedAt };
+        case 'failed':
+            return { ...common, at: status.finishedAt, error: status.error };
+        case 'interrupted':
+            return { ...common, at: status.interruptedAt };
+    }
+}
+/**
+ * Queue a job from an admin form unless one of its name is active, say which
+ * happened, and send the browser back to the job's panel.
+ */
+export async function queueJobFromForm(c, job, payload, replies) {
+    const enqueued = await c.var.jobs.enqueueUnlessActive(job, payload);
+    if (enqueued.queued)
+        flash(c, 'notice', replies.queued);
+    else
+        flash(c, 'warning', replies.busy);
+    return c.redirect(replies.panel, 303);
+}
+//# sourceMappingURL=job-status.js.map

package/dist/admin/job-status.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"job-status.js","sourceRoot":"","sources":["../../src/admin/job-status.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAcnC,MAAM,MAAM,GAA2C;IACrD,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;IAClB,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;IAChB,WAAW,EAAE,aAAa;CAC3B,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,MAA6B;IACzD,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,MAAM,MAAM,GAAG;QACb,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;QAC3B,MAAM,EAAE,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS;QAC/D,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACF,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC;QACrB,KAAK,QAAQ;YACX,OAAO;gBACL,GAAG,MAAM;gBACT,EAAE,EAAE,MAAM,CAAC,aAAa,IAAI,MAAM,CAAC,QAAQ;gBAC3C,QAAQ,EAAE,MAAM,CAAC,aAAa,KAAK,SAAS;aAC7C,CAAC;QACJ,KAAK,SAAS;YACZ,OAAO;gBACL,GAAG,MAAM;gBACT,EAAE,EAAE,MAAM,CAAC,SAAS;gBACpB,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;aACxE,CAAC;QACJ,KAAK,UAAU;YACb,OAAO,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;QAC9C,KAAK,QAAQ;YACX,OAAO,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC;QACnE,KAAK,aAAa;YAChB,OAAO,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,aAAa,EAAE,CAAC;IACnD,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,CAAsB,EACtB,GAAqB,EACrB,OAAmB,EACnB,OAAmF;IAEnF,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACpE,IAAI,QAAQ,CAAC,MAAM;QAAE,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;;QACnD,KAAK,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AACxC,CAAC"}

package/dist/admin/legacy-migrations.d.ts

@@ -0,0 +1,131 @@
+import type { DatabaseSync } from 'node:sqlite';
+/**
+ * One row of the settings table TASK-14 wrote, for the one boot that reads it.
+ *
+ * Settings live in `content/_data/site.json` now (decision-9), so this shape
+ * exists only so `migrateSettingsToFile` can write the rows out before the
+ * table goes. `updatedAt` is what tells a row written by the settings screen
+ * from a `site.json` a person edited afterwards.
+ */
+export interface LegacySetting {
+    /** The setting's name, e.g. `title`. */
+    key: string;
+    /** Its value, always a string; numbers and lists were spelled as text. */
+    value: string;
+    /** When it was last written, as an ISO instant. */
+    updatedAt: string;
+}
+/**
+ * One row of the actor key table TASK-16 wrote, for the one boot that reads it.
+ *
+ * Key pairs live in `data/keys` as JWK files now (decision-9), so this shape
+ * exists only so `migrateActorKeysToFiles` can write the rows out before the
+ * table goes. The public half the table also held is not here: it is derived
+ * from the private one, and reading it would only invite the two to disagree.
+ */
+export interface LegacyActorKey {
+    /** Which actor the pair belonged to: the sentinel identifier, not a handle. */
+    identifier: string;
+    /**
+     * Which algorithm it is for, as the table spelled it. A bare string rather
+     * than one of the algorithms this version knows, on purpose: a row a later
+     * version wrote is still a key that must reach a file rather than go with
+     * the table.
+     */
+    algorithm: string;
+    /** The private key as JWK, JSON encoded. What the file ends up holding. */
+    privateJwk: string;
+}
+/**
+ * One row of the users table TASK-9 wrote, for the one boot that reads it.
+ *
+ * Accounts live in `data/users.json` now (decision-9), so this shape exists
+ * only so `migrateUsersToFile` can write the rows out before the table goes.
+ * The id comes with them: a session in the same database names its user by it,
+ * and a migration that renumbered everybody would sign the whole site out.
+ */
+export interface LegacyUser {
+    /** The row id, which the file keeps. */
+    id: number;
+    /** The login name. */
+    username: string;
+    /** The PHC-encoded argon2id hash, moved into the file as it stands. */
+    passwordHash: string;
+    /** When the user was created, as an ISO instant. */
+    createdAt: string;
+}
+export declare function legacySettings(db: DatabaseSync): LegacySetting[] | undefined;
+export declare function legacyActorKeys(db: DatabaseSync): LegacyActorKey[] | undefined;
+export declare function legacyUsers(db: DatabaseSync): LegacyUser[] | undefined;
+/**
+ * Drop a table whose contents this version keeps in files instead.
+ *
+ * Called once the rows have been written out, and safe when the table is
+ * already gone. It is deliberately not a schema migration: a migration runs
+ * when the database is opened, which is before anything knows where the
+ * content directory is, and dropping the rows before they are written out is
+ * the one mistake this cannot make.
+ */
+export declare function dropLegacyTable(db: DatabaseSync, name: string): void;
+/**
+ * Turn an older site's settings rows into `content/_data/site.json`, once, and
+ * drop the table.
+ *
+ * TASK-14 made SQLite the source and the file its mirror; decision-9 reversed
+ * that, and a site upgrading across the two has rows nothing would ever read
+ * again. So the first boot of this version writes them out. Which side wins
+ * when both have something to say is decided the way it is decided everywhere
+ * else: the file wins when it was written after the last save, because that is
+ * a hand edit or a restored checkout, and the rows win otherwise. Either way
+ * the actor handle and type come from the rows, because `site.json` never
+ * carried them and losing them would rename the site's actor.
+ *
+ * Synchronous because `createCms` is: it runs before the server is listening
+ * and before anything else has touched the file.
+ */
+export declare function migrateSettingsToFile(db: DatabaseSync, contentDir: string): void;
+/**
+ * Turn an older site's `actor_keys` rows into files under `data/keys`, once,
+ * and drop the table.
+ *
+ * The rows this writes out are the site actor's, which no version after
+ * TASK-68 has: decision-14 replaced it with one actor per user, and a user's
+ * keys are named after their username rather than after the sentinel `actor`.
+ * The files are still written rather than dropped on the floor, because a
+ * private key is the one thing this CMS never deletes for somebody — an
+ * operator who wants the old identity back has it on disk to move.
+ *
+ * This is the migration decision-9 calls the one that must not fail. Settings
+ * a site could type again and followers a site could ask for again; an actor's
+ * private key is the site's identity, and losing it means every follower's
+ * cached public key stops verifying its posts for good. So the rows are
+ * written out before the table goes, never after, and a file that is already
+ * there always wins — a site that has booted this version once has the truth
+ * on disk, and a row left over from before it did must not overwrite it.
+ *
+ * Synchronous because `createCms` is: it runs before the server is listening
+ * and before anything has asked for a key.
+ */
+export declare function migrateActorKeysToFiles(db: DatabaseSync, dataDir: string): void;
+/**
+ * Turn an older site's users rows into `data/users.json`, once, and drop the
+ * table.
+ *
+ * TASK-9 put the accounts in SQLite; decision-9 made the database disposable,
+ * and a site upgrading across the two has rows nothing would ever read again.
+ * So the first boot of this version writes them out — ids and hashes exactly
+ * as they stand, because a session names its user by id and a hash is not
+ * something to re-encode on the way past.
+ *
+ * The file wins, as it does everywhere else: a `users.json` that is already
+ * there is left alone, so a database restored from a backup taken before the
+ * upgrade cannot bring deleted accounts back or undo a password change. The
+ * table is dropped either way, because a fresh database gets it from migration
+ * 1 — which has shipped, and so is never edited — and a site that has been
+ * migrated must not be asked again.
+ *
+ * Synchronous because `createCms` is: it runs before the server is listening
+ * and before anything else has touched the file.
+ */
+export declare function migrateUsersToFile(db: DatabaseSync, dataDir: string): void;
+//# sourceMappingURL=legacy-migrations.d.ts.map

package/dist/admin/legacy-migrations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-migrations.d.ts","sourceRoot":"","sources":["../../src/admin/legacy-migrations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAahD;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;IACZ,0EAA0E;IAC1E,KAAK,EAAE,MAAM,CAAC;IACd,mDAAmD;IACnD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAc;IAC7B,+EAA+E;IAC/E,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB,2EAA2E;IAC3E,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,UAAU;IACzB,wCAAwC;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,sBAAsB;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,uEAAuE;IACvE,YAAY,EAAE,MAAM,CAAC;IACrB,oDAAoD;IACpD,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,YAAY,GAAG,aAAa,EAAE,GAAG,SAAS,CAY5E;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,GAAG,cAAc,EAAE,GAAG,SAAS,CAa9E;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,YAAY,GAAG,UAAU,EAAE,GAAG,SAAS,CAatE;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,CAIpE;AAUD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAmBhF;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAsB/E;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAkB1E"}