@jant/core 0.11.0 → 0.12.0
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/bin/commands/deploy.js +179 -0
- package/bin/lib/cloudflare-setup.js +499 -0
- package/bin/lib/d1-query.js +26 -1
- package/bin/lib/r2-query.js +2 -2
- package/dist/{app-jQI4OPRe.js → app-DSwsDBD0.js} +28623 -635
- package/dist/client/.vite/manifest.json +2 -2
- package/dist/client/_assets/{client-52vQhZAv.js → client-DPByjWoU.js} +1 -1
- package/dist/client/_assets/{client-auth-BDcCR6u1.js → client-auth-CPqPTX1B.js} +1 -1
- package/dist/index.js +1 -1
- package/dist/node.js +2 -2
- package/package.json +31 -31
- package/src/__tests__/bin/deploy.test.ts +163 -0
- package/src/__tests__/export-hugo-build.test.ts +5 -5
- package/src/__tests__/export-import-roundtrip.test.ts +1 -1
- package/src/__tests__/export-service.test.ts +2 -2
- package/src/__tests__/fixtures/releases/0.11.0/site-export/README.md +130 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/297kg/_index.md +14 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2thjq/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2u5e5/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/0x4nv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/faqyt/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5kayp/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/hu597/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/archive/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/bought-too-many-lemons-again/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/city-walks/_index.md +14 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/co344/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/collections/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/current-tea-rotation/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/desk-but-better/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/e0kcg/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/egi3c/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/evf9j/_index.md +129 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/featured/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-draft/_index.md +17 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-quotes/_index.md +13 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-text-attachment/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-basho/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-epictetus/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-seneca/_index.md +26 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-thoreau/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/3zqv7/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/_index.md +37 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gwob9/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/home-cooking/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/hz729/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/j4v0q/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k278t/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k4eee/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a83qu/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/l2m7y/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +52 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/n09le/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +40 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/c91j0/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/qyucy/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/wsgck/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/reading-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/s4r3e/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/cxiu6/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/t77ms/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tiny-projects/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/useful-links/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/weekend-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +50 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/data/jant.toml +155 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/hugo.toml +45 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/_redirects +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/3c46a9ea6fe0-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m50607a6e8h8gfpa8byqtt7h.md +3 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/wrangler.jsonc +24 -0
- package/src/__tests__/fixtures/releases/0.11.0/snapshot/db.sql +339 -0
- package/src/__tests__/fixtures/releases/0.11.0/snapshot/meta.json +11 -0
- package/src/__tests__/helpers/d1-round-trips.ts +213 -0
- package/src/__tests__/package-dependencies.test.ts +123 -0
- package/src/__tests__/public-page-round-trips.test.ts +203 -0
- package/src/__tests__/template-deploy-workflow.test.ts +33 -77
- package/src/__tests__/vite-config.test.ts +32 -0
- package/src/app.tsx +7 -1
- package/src/client/icons.ts +5 -6
- package/src/db/__tests__/d1-query.test.ts +29 -0
- package/src/db/__tests__/migration-rehearsal.test.ts +2 -2
- package/src/lib/__tests__/icons.test.ts +21 -10
- package/src/lib/api-posts.ts +4 -2
- package/src/lib/api-public-posts.ts +4 -2
- package/src/lib/constants.ts +20 -0
- package/src/lib/icons.ts +96 -34
- package/src/lib/post-display.ts +13 -9
- package/src/lib/timeline.ts +23 -21
- package/src/lib/view.ts +3 -2
- package/src/middleware/__tests__/onboarding.test.ts +5 -3
- package/src/middleware/__tests__/secure-headers.test.ts +40 -42
- package/src/middleware/config.ts +44 -2
- package/src/middleware/onboarding.ts +12 -3
- package/src/middleware/secure-headers.ts +25 -36
- package/src/node/__tests__/cli-deploy-setup.test.ts +373 -0
- package/src/node/__tests__/cli-deploy.test.ts +55 -0
- package/src/routes/feed/feed.ts +4 -2
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +10 -10
- package/src/routes/pages/archive.tsx +36 -17
- package/src/routes/pages/collection.tsx +72 -35
- package/src/routes/pages/page.tsx +46 -25
- package/src/routes/pages/search.tsx +3 -1
- package/src/services/__tests__/collection.test.ts +2 -4
- package/src/services/collection.ts +95 -71
- package/src/services/export.ts +2 -1
- package/src/services/post.ts +150 -205
- package/src/services/settings.ts +4 -8
- package/src/types/app-context.ts +5 -0
- package/src/ui/pages/ArchivePage.tsx +34 -34
- package/src/ui/pages/CollectionPage.tsx +1 -1
- package/src/ui/pages/SmartCollectionPage.tsx +2 -2
- package/src/ui/pages/SubscribePage.tsx +2 -4
- package/src/ui/shared/CollectionDirectory.tsx +2 -2
- package/src/ui/shared/CollectionsManager.tsx +1 -1
- package/src/ui/shared/CopyField.tsx +1 -1
- package/src/ui/shared/Icon.tsx +5 -5
- package/src/ui/shared/IconSprite.tsx +10 -11
- package/src/ui/shared/custom-icons.ts +38 -7
- package/src/ui/shared/icon-collector.ts +7 -5
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* table with fractional indexing.
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
|
-
import { eq, asc, sql, and, inArray, desc } from "drizzle-orm";
|
|
10
|
+
import { eq, asc, sql, and, inArray, desc, getTableColumns } from "drizzle-orm";
|
|
11
11
|
import { generateKeyBetween } from "fractional-indexing";
|
|
12
12
|
import {
|
|
13
13
|
type Database,
|
|
@@ -47,6 +47,7 @@ import {
|
|
|
47
47
|
} from "../lib/errors.js";
|
|
48
48
|
import {
|
|
49
49
|
createPathService,
|
|
50
|
+
fromCollectionPath,
|
|
50
51
|
toCollectionPath,
|
|
51
52
|
type PathService,
|
|
52
53
|
} from "./path.js";
|
|
@@ -117,6 +118,17 @@ export interface CollectionDirectoryViewer {
|
|
|
117
118
|
|
|
118
119
|
export interface CollectionService {
|
|
119
120
|
getById(id: string): Promise<Collection | null>;
|
|
121
|
+
/**
|
|
122
|
+
* A collection with its canonical address: its oldest custom URL, which
|
|
123
|
+
* the page redirects every other way in to.
|
|
124
|
+
*
|
|
125
|
+
* @param id - Collection id
|
|
126
|
+
* @returns The collection and its oldest alias path (no leading slash), or
|
|
127
|
+
* null when no collection has the id
|
|
128
|
+
*/
|
|
129
|
+
getWithCanonicalAlias(
|
|
130
|
+
id: string,
|
|
131
|
+
): Promise<{ collection: Collection; canonicalAlias: string | null } | null>;
|
|
120
132
|
getBySlug(slug: string): Promise<Collection | null>;
|
|
121
133
|
getBySlugs(slugs: string[]): Promise<Collection[]>;
|
|
122
134
|
resolveSelection(
|
|
@@ -227,9 +239,15 @@ export interface CollectionService {
|
|
|
227
239
|
getPinnedThreadIds(collectionIds: string[]): Promise<Set<string>>;
|
|
228
240
|
/** Get the Thread-level collections shared by a post and its siblings */
|
|
229
241
|
getCollectionsByPostId(postId: string): Promise<Collection[]>;
|
|
230
|
-
/**
|
|
231
|
-
|
|
232
|
-
|
|
242
|
+
/**
|
|
243
|
+
* The collections each Thread belongs to, in the order the Thread was
|
|
244
|
+
* filed. Membership is a Thread's, so every post in it shares the entry.
|
|
245
|
+
*
|
|
246
|
+
* @param threadIds - Thread ids, which are their root posts' ids
|
|
247
|
+
* @returns Collections by Thread id; a Thread in none has no entry
|
|
248
|
+
*/
|
|
249
|
+
getCollectionsByThreadIds(
|
|
250
|
+
threadIds: string[],
|
|
233
251
|
): Promise<Map<string, Collection[]>>;
|
|
234
252
|
/**
|
|
235
253
|
* Batch get the set of collection IDs each Thread is pinned in.
|
|
@@ -636,27 +654,37 @@ export function createCollectionService(
|
|
|
636
654
|
return { id: rowId, after: toRowId(afterId), before: toRowId(beforeId) };
|
|
637
655
|
}
|
|
638
656
|
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
657
|
+
/**
|
|
658
|
+
* A collection row with its slug, read as a correlated subquery so loading
|
|
659
|
+
* a collection is one statement — see `hydratedPostColumns` in the post
|
|
660
|
+
* service, and why the outer column is written out.
|
|
661
|
+
*/
|
|
662
|
+
const hydratedCollectionColumns = {
|
|
663
|
+
...getTableColumns(collections),
|
|
664
|
+
slug: sql<string | null>`(
|
|
665
|
+
SELECT collection_slug.path
|
|
666
|
+
FROM path_registry AS collection_slug
|
|
667
|
+
WHERE collection_slug.site_id = ${siteId}
|
|
668
|
+
AND collection_slug.collection_id = "collection"."id"
|
|
669
|
+
AND collection_slug.kind = 'slug'
|
|
670
|
+
)`.as("collection_slug"),
|
|
671
|
+
};
|
|
672
|
+
|
|
673
|
+
type HydratedCollectionRow = typeof collections.$inferSelect & {
|
|
674
|
+
slug: string | null;
|
|
675
|
+
};
|
|
676
|
+
|
|
677
|
+
/** Null for a row with no slug: a collection with no address. */
|
|
678
|
+
function hydrateCollection(
|
|
679
|
+
row: HydratedCollectionRow | undefined,
|
|
680
|
+
): Collection | null {
|
|
681
|
+
if (!row?.slug) return null;
|
|
682
|
+
return toCollection(row, fromCollectionPath(row.slug));
|
|
646
683
|
}
|
|
647
684
|
|
|
648
|
-
|
|
649
|
-
rows: (typeof collections.$inferSelect)[],
|
|
650
|
-
): Promise<Collection[]> {
|
|
651
|
-
if (rows.length === 0) return [];
|
|
652
|
-
const slugMap = await resolvedPaths.getCollectionSlugMap(
|
|
653
|
-
rows.map((row) => row.id),
|
|
654
|
-
);
|
|
685
|
+
function hydrateCollections(rows: HydratedCollectionRow[]): Collection[] {
|
|
655
686
|
return rows
|
|
656
|
-
.map((row) =>
|
|
657
|
-
const slug = slugMap.get(row.id);
|
|
658
|
-
return slug ? toCollection(row, slug) : null;
|
|
659
|
-
})
|
|
687
|
+
.map((row) => hydrateCollection(row))
|
|
660
688
|
.filter((row): row is Collection => row !== null);
|
|
661
689
|
}
|
|
662
690
|
|
|
@@ -695,7 +723,7 @@ export function createCollectionService(
|
|
|
695
723
|
|
|
696
724
|
const rows = await db
|
|
697
725
|
.select({
|
|
698
|
-
collection:
|
|
726
|
+
collection: hydratedCollectionColumns,
|
|
699
727
|
threadCount,
|
|
700
728
|
recentActivityAt,
|
|
701
729
|
})
|
|
@@ -722,19 +750,13 @@ export function createCollectionService(
|
|
|
722
750
|
.groupBy(collections.id)
|
|
723
751
|
.orderBy(asc(collections.createdAt));
|
|
724
752
|
|
|
725
|
-
if (rows.length === 0) return [];
|
|
726
|
-
|
|
727
|
-
const slugMap = await resolvedPaths.getCollectionSlugMap(
|
|
728
|
-
rows.map((row) => row.collection.id),
|
|
729
|
-
);
|
|
730
|
-
|
|
731
753
|
return rows
|
|
732
754
|
.map((row) => {
|
|
733
|
-
const
|
|
734
|
-
if (!
|
|
755
|
+
const collection = hydrateCollection(row.collection);
|
|
756
|
+
if (!collection) return null;
|
|
735
757
|
|
|
736
758
|
return {
|
|
737
|
-
...
|
|
759
|
+
...collection,
|
|
738
760
|
threadCount: row.threadCount,
|
|
739
761
|
recentActivityAt: row.recentActivityAt ?? row.collection.updatedAt,
|
|
740
762
|
};
|
|
@@ -845,13 +867,38 @@ export function createCollectionService(
|
|
|
845
867
|
return {
|
|
846
868
|
async getById(id) {
|
|
847
869
|
const result = await db
|
|
848
|
-
.select()
|
|
870
|
+
.select(hydratedCollectionColumns)
|
|
849
871
|
.from(collections)
|
|
850
872
|
.where(and(eq(collections.siteId, siteId), eq(collections.id, id)))
|
|
851
873
|
.limit(1);
|
|
852
874
|
return hydrateCollection(result[0]);
|
|
853
875
|
},
|
|
854
876
|
|
|
877
|
+
async getWithCanonicalAlias(id) {
|
|
878
|
+
// Oldest first, ties to the lower id, as `customUrls.getByTarget` and
|
|
879
|
+
// the post's own canonical alias take it.
|
|
880
|
+
const result = await db
|
|
881
|
+
.select({
|
|
882
|
+
...hydratedCollectionColumns,
|
|
883
|
+
canonicalAlias: sql<string | null>`(
|
|
884
|
+
SELECT collection_alias.path
|
|
885
|
+
FROM path_registry AS collection_alias
|
|
886
|
+
WHERE collection_alias.site_id = ${siteId}
|
|
887
|
+
AND collection_alias.collection_id = "collection"."id"
|
|
888
|
+
AND collection_alias.kind = 'alias'
|
|
889
|
+
ORDER BY collection_alias.created_at, collection_alias.id
|
|
890
|
+
LIMIT 1
|
|
891
|
+
)`.as("canonical_alias"),
|
|
892
|
+
})
|
|
893
|
+
.from(collections)
|
|
894
|
+
.where(and(eq(collections.siteId, siteId), eq(collections.id, id)))
|
|
895
|
+
.limit(1);
|
|
896
|
+
const row = result[0];
|
|
897
|
+
const collection = hydrateCollection(row);
|
|
898
|
+
if (!row || !collection) return null;
|
|
899
|
+
return { collection, canonicalAlias: row.canonicalAlias };
|
|
900
|
+
},
|
|
901
|
+
|
|
855
902
|
async getBySlug(slug) {
|
|
856
903
|
const resolved = await resolvedPaths.resolve(toCollectionPath(slug));
|
|
857
904
|
if (!resolved || resolved.kind !== "slug" || !resolved.collectionId) {
|
|
@@ -887,7 +934,7 @@ export function createCollectionService(
|
|
|
887
934
|
|
|
888
935
|
async list() {
|
|
889
936
|
const rows = await db
|
|
890
|
-
.select()
|
|
937
|
+
.select(hydratedCollectionColumns)
|
|
891
938
|
.from(collections)
|
|
892
939
|
.where(eq(collections.siteId, siteId))
|
|
893
940
|
.orderBy(asc(collections.createdAt));
|
|
@@ -928,7 +975,7 @@ export function createCollectionService(
|
|
|
928
975
|
number | null
|
|
929
976
|
>`MAX(${threadCollections.createdAt})`.as("last_added_at");
|
|
930
977
|
const rows = await db
|
|
931
|
-
.select({ collection:
|
|
978
|
+
.select({ collection: hydratedCollectionColumns, lastAddedAt })
|
|
932
979
|
.from(collections)
|
|
933
980
|
.leftJoin(
|
|
934
981
|
threadCollections,
|
|
@@ -1117,9 +1164,10 @@ export function createCollectionService(
|
|
|
1117
1164
|
.update(collections)
|
|
1118
1165
|
.set(updates)
|
|
1119
1166
|
.where(and(eq(collections.siteId, siteId), eq(collections.id, id)))
|
|
1120
|
-
.returning();
|
|
1167
|
+
.returning({ id: collections.id });
|
|
1121
1168
|
|
|
1122
|
-
|
|
1169
|
+
// RETURNING carries no slug, so the collection is read back whole.
|
|
1170
|
+
return result[0] ? this.getById(id) : null;
|
|
1123
1171
|
},
|
|
1124
1172
|
|
|
1125
1173
|
async delete(id) {
|
|
@@ -1560,7 +1608,7 @@ export function createCollectionService(
|
|
|
1560
1608
|
|
|
1561
1609
|
async getCollectionsByPostId(postId) {
|
|
1562
1610
|
const rows = await db
|
|
1563
|
-
.select({ collection:
|
|
1611
|
+
.select({ collection: hydratedCollectionColumns })
|
|
1564
1612
|
.from(posts)
|
|
1565
1613
|
.innerJoin(
|
|
1566
1614
|
threadCollections,
|
|
@@ -1588,26 +1636,15 @@ export function createCollectionService(
|
|
|
1588
1636
|
return hydrateCollections(rows.map((row) => row.collection));
|
|
1589
1637
|
},
|
|
1590
1638
|
|
|
1591
|
-
async
|
|
1639
|
+
async getCollectionsByThreadIds(threadIds) {
|
|
1592
1640
|
const result = new Map<string, Collection[]>();
|
|
1593
|
-
if (postIds.length === 0) return result;
|
|
1594
|
-
|
|
1595
|
-
const postRows = await batchQueryRows(postIds, (chunk) =>
|
|
1596
|
-
db
|
|
1597
|
-
.select({
|
|
1598
|
-
postId: posts.id,
|
|
1599
|
-
threadId: posts.threadId,
|
|
1600
|
-
})
|
|
1601
|
-
.from(posts)
|
|
1602
|
-
.where(and(eq(posts.siteId, siteId), inArray(posts.id, chunk))),
|
|
1603
|
-
);
|
|
1604
|
-
const threadIds = [...new Set(postRows.map((row) => row.threadId))];
|
|
1605
1641
|
if (threadIds.length === 0) return result;
|
|
1606
|
-
|
|
1642
|
+
|
|
1643
|
+
const rows = await batchQueryRows([...new Set(threadIds)], (chunk) =>
|
|
1607
1644
|
db
|
|
1608
1645
|
.select({
|
|
1609
1646
|
threadId: threadCollections.threadId,
|
|
1610
|
-
collection:
|
|
1647
|
+
collection: hydratedCollectionColumns,
|
|
1611
1648
|
})
|
|
1612
1649
|
.from(threadCollections)
|
|
1613
1650
|
.innerJoin(
|
|
@@ -1627,25 +1664,12 @@ export function createCollectionService(
|
|
|
1627
1664
|
),
|
|
1628
1665
|
);
|
|
1629
1666
|
|
|
1630
|
-
const collectionRows = rows.map((row) => row.collection);
|
|
1631
|
-
const slugMap = await resolvedPaths.getCollectionSlugMap(
|
|
1632
|
-
collectionRows.map((row) => row.id),
|
|
1633
|
-
);
|
|
1634
|
-
|
|
1635
|
-
const collectionsByThread = new Map<string, Collection[]>();
|
|
1636
1667
|
for (const row of rows) {
|
|
1637
|
-
const
|
|
1638
|
-
if (!
|
|
1639
|
-
const existing =
|
|
1640
|
-
existing.push(
|
|
1641
|
-
|
|
1642
|
-
}
|
|
1643
|
-
|
|
1644
|
-
for (const row of postRows) {
|
|
1645
|
-
const threadMemberships = collectionsByThread.get(row.threadId);
|
|
1646
|
-
if (threadMemberships) {
|
|
1647
|
-
result.set(row.postId, threadMemberships);
|
|
1648
|
-
}
|
|
1668
|
+
const collection = hydrateCollection(row.collection);
|
|
1669
|
+
if (!collection) continue;
|
|
1670
|
+
const existing = result.get(row.threadId);
|
|
1671
|
+
if (existing) existing.push(collection);
|
|
1672
|
+
else result.set(row.threadId, [collection]);
|
|
1649
1673
|
}
|
|
1650
1674
|
|
|
1651
1675
|
return result;
|
package/src/services/export.ts
CHANGED
|
@@ -445,7 +445,8 @@ export function createExportService(
|
|
|
445
445
|
collectionSlugMap,
|
|
446
446
|
standalonePaths,
|
|
447
447
|
] = await Promise.all([
|
|
448
|
-
|
|
448
|
+
// A root's id is its Thread's id.
|
|
449
|
+
services.collections.getCollectionsByThreadIds(rootPostIds),
|
|
449
450
|
services.collections.getCollectionEntriesByThreadIds(rootPostIds),
|
|
450
451
|
services.media.getByPostIds(allPostIds),
|
|
451
452
|
services.paths.getPostSlugMap(allPostIds),
|