From 0800d2df9de74ebbc4e5b99e651f01596d9313d5 Mon Sep 17 00:00:00 2001
From: Script Raccoon <scriptraccoon@gmail.com>
Date: Mon, 18 May 2026 22:44:00 +0200
Subject: [PATCH 1/2] merge CategoryList and FunctorList into one component

---
 src/components/CategoryList.svelte            | 36 ------------------
 src/components/EntityList.svelte              | 37 ++++++++++++++++++
 src/components/FunctorList.svelte             | 38 -------------------
 src/lib/commons/types.ts                      |  5 +++
 src/routes/categories/+page.svelte            |  4 +-
 src/routes/categories/[tag]/+page.svelte      |  4 +-
 .../category-implication/[id]/+page.svelte    |  4 +-
 .../category-property/[id]/+page.svelte       |  8 ++--
 .../category-search/results/+page.svelte      |  4 +-
 src/routes/category/[id]/+page.svelte         |  4 +-
 src/routes/content/[id]/+page.svelte          |  4 +-
 .../functor-implication/[id]/+page.svelte     |  4 +-
 src/routes/functor-property/[id]/+page.svelte |  8 ++--
 .../functor-search/results/+page.svelte       |  4 +-
 src/routes/functors/+page.svelte              |  4 +-
 src/routes/missing/+page.svelte               |  9 ++---
 16 files changed, 72 insertions(+), 105 deletions(-)
 delete mode 100644 src/components/CategoryList.svelte
 create mode 100644 src/components/EntityList.svelte
 delete mode 100644 src/components/FunctorList.svelte

diff --git a/src/components/CategoryList.svelte b/src/components/CategoryList.svelte
deleted file mode 100644
index 13820dafb..000000000
--- a/src/components/CategoryList.svelte
+++ /dev/null
@@ -1,36 +0,0 @@
-<script lang="ts">
-	import type { CategoryShort } from '$lib/commons/types'
-
-	type Props = {
-		categories: (CategoryShort & { count?: number })[]
-	}
-
-	let { categories }: Props = $props()
-</script>
-
-{#if categories.length}
-	<ul>
-		{#each categories as item}
-			<li>
-				<a href="/category/{item.id}">
-					{item.name}
-				</a>
-				{#if item.count !== undefined}
-					<span class="count">({item.count})</span>
-				{/if}
-			</li>
-		{/each}
-	</ul>
-{:else}
-	<p>&mdash;</p>
-{/if}
-
-<style>
-	ul {
-		margin-block: 1rem;
-	}
-
-	.count {
-		color: var(--secondary-text-color);
-	}
-</style>
diff --git a/src/components/EntityList.svelte b/src/components/EntityList.svelte
new file mode 100644
index 000000000..5b3eb8e9d
--- /dev/null
+++ b/src/components/EntityList.svelte
@@ -0,0 +1,37 @@
+<script lang="ts">
+	import type { EntityShort } from '$lib/commons/types'
+
+	type Props = {
+		entities: (EntityShort & { count?: number })[]
+		type: 'category' | 'functor'
+	}
+
+	let { entities, type }: Props = $props()
+</script>
+
+{#if entities.length}
+	<ul>
+		{#each entities as entity}
+			<li>
+				<a href="/{type}/{entity.id}">
+					{entity.name}
+				</a>
+				{#if entity.count !== undefined}
+					<span class="count">({entity.count})</span>
+				{/if}
+			</li>
+		{/each}
+	</ul>
+{:else}
+	<p>&mdash;</p>
+{/if}
+
+<style>
+	ul {
+		margin-block: 1rem;
+	}
+
+	.count {
+		color: var(--secondary-text-color);
+	}
+</style>
diff --git a/src/components/FunctorList.svelte b/src/components/FunctorList.svelte
deleted file mode 100644
index 851e6d0d2..000000000
--- a/src/components/FunctorList.svelte
+++ /dev/null
@@ -1,38 +0,0 @@
-<script lang="ts">
-	// TODO: remove code duplication with CategoryList component
-
-	import type { FunctorShort } from '$lib/commons/types'
-
-	type Props = {
-		functors: (FunctorShort & { count?: number })[]
-	}
-
-	let { functors }: Props = $props()
-</script>
-
-{#if functors.length}
-	<ul>
-		{#each functors as functor}
-			<li>
-				<a href="/functor/{functor.id}">
-					{functor.name}
-				</a>
-				{#if functor.count !== undefined}
-					<span class="count">({functor.count})</span>
-				{/if}
-			</li>
-		{/each}
-	</ul>
-{:else}
-	<p>&mdash;</p>
-{/if}
-
-<style>
-	ul {
-		margin-block: 1rem;
-	}
-
-	.count {
-		color: var(--secondary-text-color);
-	}
-</style>
diff --git a/src/lib/commons/types.ts b/src/lib/commons/types.ts
index bed2e1ef2..185160ce8 100644
--- a/src/lib/commons/types.ts
+++ b/src/lib/commons/types.ts
@@ -17,6 +17,11 @@ export type CategoryDisplay = {
 	dual_category_notation: string | null
 }
 
+export type EntityShort = {
+	id: string
+	name: string
+}
+
 export type CategoryShort = Pick<CategoryDisplay, 'id' | 'name'>
 
 export type RelatedCategory = Pick<CategoryDisplay, 'id' | 'name' | 'notation'>
diff --git a/src/routes/categories/+page.svelte b/src/routes/categories/+page.svelte
index 789df806d..be456e466 100644
--- a/src/routes/categories/+page.svelte
+++ b/src/routes/categories/+page.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-	import CategoryList from '$components/CategoryList.svelte'
 	import Chip from '$components/Chip.svelte'
 	import ChipGroup from '$components/ChipGroup.svelte'
 	import MetaData from '$components/MetaData.svelte'
 	import SearchFilter from '$components/SearchFilter.svelte'
 	import SuggestionForm from '$components/SuggestionForm.svelte'
 	import { filter_by_tag, normalize_text, pluralize } from '$lib/client/utils'
+	import EntityList from '$components/EntityList.svelte'
 
 	let { data } = $props()
 
@@ -34,7 +34,7 @@
 		})}
 	</p>
 
-	<CategoryList categories={searched_categories} />
+	<EntityList entities={searched_categories} type="category" />
 </section>
 
 <section>
diff --git a/src/routes/categories/[tag]/+page.svelte b/src/routes/categories/[tag]/+page.svelte
index 2a87d2480..5941cfebf 100644
--- a/src/routes/categories/[tag]/+page.svelte
+++ b/src/routes/categories/[tag]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import CategoryList from '$components/CategoryList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 	import MetaData from '$components/MetaData.svelte'
 	import { pluralize } from '$lib/client/utils'
 
@@ -17,4 +17,4 @@
 	})}
 </p>
 
-<CategoryList categories={data.categories} />
+<EntityList entities={data.categories} type="category" />
diff --git a/src/routes/category-implication/[id]/+page.svelte b/src/routes/category-implication/[id]/+page.svelte
index 344b3d18d..758937681 100644
--- a/src/routes/category-implication/[id]/+page.svelte
+++ b/src/routes/category-implication/[id]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import CategoryList from '$components/CategoryList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 	import MetaData from '$components/MetaData.svelte'
 	import SuggestionForm from '$components/SuggestionForm.svelte'
 	import { pluralize } from '$lib/client/utils'
@@ -65,7 +65,7 @@
 				other: 'Show {count} categories using this implication',
 			})}
 		</summary>
-		<CategoryList categories={data.categories} />
+		<EntityList entities={data.categories} type="category" />
 	</details>
 {/if}
 
diff --git a/src/routes/category-property/[id]/+page.svelte b/src/routes/category-property/[id]/+page.svelte
index 1362b55c6..aade3630d 100644
--- a/src/routes/category-property/[id]/+page.svelte
+++ b/src/routes/category-property/[id]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import CategoryList from '$components/CategoryList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 	import HelpMessage from '$components/HelpMessage.svelte'
 	import CategoryImplicationList from '$components/CategoryImplicationList.svelte'
 	import MetaData from '$components/MetaData.svelte'
@@ -79,7 +79,7 @@
 	})}
 </p>
 
-<CategoryList categories={data.examples} />
+<EntityList entities={data.examples} type="category" />
 
 <h3 class="sticky-heading">Counterexamples</h3>
 
@@ -90,7 +90,7 @@
 	})}
 </p>
 
-<CategoryList categories={data.counterexamples} />
+<EntityList entities={data.counterexamples} type="category" />
 
 <h3 class="sticky-heading">Unknown</h3>
 
@@ -105,6 +105,6 @@
 	{/if}
 </p>
 
-<CategoryList categories={data.unknown_categories} />
+<EntityList entities={data.unknown_categories} type="category" />
 
 <SuggestionForm />
diff --git a/src/routes/category-search/results/+page.svelte b/src/routes/category-search/results/+page.svelte
index 260d0ec7b..1f8cd784e 100644
--- a/src/routes/category-search/results/+page.svelte
+++ b/src/routes/category-search/results/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { browser } from '$app/environment'
-	import CategoryList from '$components/CategoryList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 	import { encode_property_ID, get_property_url } from '$lib/commons/property.url'
 	import MetaData from '$components/MetaData.svelte'
 	import { SEARCH_SEPARATOR } from '$lib/commons/search.config'
@@ -70,7 +70,7 @@
 			other: 'Found {count} categories',
 		})}
 	</p>
-	<CategoryList categories={data.found_objects ?? []} />
+	<EntityList entities={data.found_objects ?? []} type="category" />
 {:else}
 	<p class="hint">
 		<Fa icon={faWarning} /> No categories found because the requirements are inconsistent:
diff --git a/src/routes/category/[id]/+page.svelte b/src/routes/category/[id]/+page.svelte
index 84f6e4298..e8a5cd364 100644
--- a/src/routes/category/[id]/+page.svelte
+++ b/src/routes/category/[id]/+page.svelte
@@ -6,11 +6,11 @@
 	import { category_detail_level } from '$lib/states/detail_level.svelte'
 	import TextWithReason from '$components/TextWithReason.svelte'
 	import { filter_by_tag, pluralize } from '$lib/client/utils'
-	import CategoryList from '$components/CategoryList.svelte'
 	import { faCommentDots, faQuestion } from '@fortawesome/free-solid-svg-icons'
 	import Fa from 'svelte-fa'
 	import SuggestionForm from '$components/SuggestionForm.svelte'
 	import HelpMessage from '$components/HelpMessage.svelte'
+	import EntityList from '$components/EntityList.svelte'
 
 	let { data } = $props()
 
@@ -206,7 +206,7 @@
 			that a distinguishing property may be missing from the database.
 		</p>
 
-		<CategoryList categories={data.undistinguishable_categories} />
+		<EntityList entities={data.undistinguishable_categories} type="category" />
 	</section>
 {/if}
 
diff --git a/src/routes/content/[id]/+page.svelte b/src/routes/content/[id]/+page.svelte
index 047ec2b04..332b4c755 100644
--- a/src/routes/content/[id]/+page.svelte
+++ b/src/routes/content/[id]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import CategoryList from '$components/CategoryList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 	import MetaData from '$components/MetaData.svelte'
 	import PropertyList from '$components/PropertyList.svelte'
 	import SuggestionForm from '$components/SuggestionForm.svelte'
@@ -23,7 +23,7 @@
 	{#if data.categories.length > 0}
 		<p class="hint">This page is referenced by the following categories.</p>
 
-		<CategoryList categories={data.categories} />
+		<EntityList entities={data.categories} type="category" />
 	{/if}
 
 	{#if data.category_properties.length > 0}
diff --git a/src/routes/functor-implication/[id]/+page.svelte b/src/routes/functor-implication/[id]/+page.svelte
index 0c4372d4c..239fc143b 100644
--- a/src/routes/functor-implication/[id]/+page.svelte
+++ b/src/routes/functor-implication/[id]/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import FunctorList from '$components/FunctorList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 	import MetaData from '$components/MetaData.svelte'
 	import SuggestionForm from '$components/SuggestionForm.svelte'
 	import { pluralize } from '$lib/client/utils'
@@ -91,7 +91,7 @@
 				other: 'Show {count} functors using this implication',
 			})}
 		</summary>
-		<FunctorList functors={data.functors} />
+		<EntityList entities={data.functors} type="functor" />
 	</details>
 {/if}
 
diff --git a/src/routes/functor-property/[id]/+page.svelte b/src/routes/functor-property/[id]/+page.svelte
index cde71a4d1..53e6adc61 100644
--- a/src/routes/functor-property/[id]/+page.svelte
+++ b/src/routes/functor-property/[id]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import FunctorImplicationList from '$components/FunctorImplicationList.svelte'
-	import FunctorList from '$components/FunctorList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 	import MetaData from '$components/MetaData.svelte'
 	import SuggestionForm from '$components/SuggestionForm.svelte'
 	import { pluralize } from '$lib/client/utils'
@@ -61,7 +61,7 @@
 	})}
 </p>
 
-<FunctorList functors={data.examples} />
+<EntityList entities={data.examples} type="functor" />
 
 <h3 class="sticky-heading">Counterexamples</h3>
 
@@ -72,7 +72,7 @@
 	})}
 </p>
 
-<FunctorList functors={data.counterexamples} />
+<EntityList entities={data.counterexamples} type="functor" />
 
 <h3 class="sticky-heading">Unknown</h3>
 
@@ -87,6 +87,6 @@
 	{/if}
 </p>
 
-<FunctorList functors={data.unknown_functors} />
+<EntityList entities={data.unknown_functors} type="functor" />
 
 <SuggestionForm />
diff --git a/src/routes/functor-search/results/+page.svelte b/src/routes/functor-search/results/+page.svelte
index aca376256..1154dc199 100644
--- a/src/routes/functor-search/results/+page.svelte
+++ b/src/routes/functor-search/results/+page.svelte
@@ -4,7 +4,7 @@
 	import MetaData from '$components/MetaData.svelte'
 	import { SEARCH_SEPARATOR } from '$lib/commons/search.config'
 	import { pluralize } from '$lib/client/utils'
-	import FunctorList from '$components/FunctorList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 
 	let { data } = $props()
 
@@ -68,7 +68,7 @@
 	})}
 </p>
 
-<FunctorList functors={data.found_objects ?? []} />
+<EntityList entities={data.found_objects ?? []} type="functor" />
 
 <menu>
 	<a class="button" href="/functor-search">Adjust search</a>
diff --git a/src/routes/functors/+page.svelte b/src/routes/functors/+page.svelte
index daaef7fcf..28087771d 100644
--- a/src/routes/functors/+page.svelte
+++ b/src/routes/functors/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import FunctorList from '$components/FunctorList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 	import MetaData from '$components/MetaData.svelte'
 	import SuggestionForm from '$components/SuggestionForm.svelte'
 	import { pluralize } from '$lib/client/utils'
@@ -28,6 +28,6 @@
 	})}
 </p>
 
-<FunctorList functors={data.functors} />
+<EntityList entities={data.functors} type="functor" />
 
 <SuggestionForm />
diff --git a/src/routes/missing/+page.svelte b/src/routes/missing/+page.svelte
index faa36e588..66e25e178 100644
--- a/src/routes/missing/+page.svelte
+++ b/src/routes/missing/+page.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-	import CategoryList from '$components/CategoryList.svelte'
-	import FunctorList from '$components/FunctorList.svelte'
+	import EntityList from '$components/EntityList.svelte'
 	import MetaData from '$components/MetaData.svelte'
 	import SuggestionForm from '$components/SuggestionForm.svelte'
 	import { get_property_url } from '$lib/commons/property.url'
@@ -29,7 +28,7 @@
 		property)-pairs.
 	</p>
 
-	<CategoryList categories={data.categories_with_unknown_properties} />
+	<EntityList entities={data.categories_with_unknown_properties} type="category" />
 </section>
 
 <section>
@@ -40,7 +39,7 @@
 		one type of special morphism is unknown.
 	</p>
 
-	<CategoryList categories={data.categories_with_missing_morphisms} />
+	<EntityList entities={data.categories_with_missing_morphisms} type="category" />
 </section>
 
 {#if data.undistinguishable_category_pairs.length > 0}
@@ -104,7 +103,7 @@
 		properties.
 	</p>
 
-	<FunctorList functors={data.functors_with_unknown_properties} />
+	<EntityList entities={data.functors_with_unknown_properties} type="functor" />
 </section>
 
 <SuggestionForm />

From 0fac6a7fbd3097aad5ae8a6df85744053db45e36 Mon Sep 17 00:00:00 2001
From: Script Raccoon <scriptraccoon@gmail.com>
Date: Mon, 18 May 2026 23:24:48 +0200
Subject: [PATCH 2/2] unify several types

---
 src/components/CategoryImplicationItem.svelte |  7 +-
 src/components/CategoryImplicationList.svelte |  4 +-
 src/lib/commons/types.ts                      | 75 ++++++-------------
 src/lib/server/utils.ts                       | 46 ++++++------
 src/routes/categories/+page.server.ts         |  4 +-
 src/routes/categories/[tag]/+page.server.ts   |  4 +-
 .../category-comparison/+page.server.ts       |  4 +-
 src/routes/category-comparison/+page.svelte   |  4 +-
 .../category-implication/[id]/+page.server.ts |  6 +-
 .../category-implications/+page.server.ts     |  6 +-
 .../category-property/[id]/+page.server.ts    | 10 +--
 src/routes/category/[id]/+page.server.ts      | 28 +++----
 src/routes/content/[id]/+page.server.ts       |  4 +-
 .../functor-implication/[id]/+page.server.ts  | 12 +--
 .../functor-implications/+page.server.ts      |  6 +-
 .../functor-property/[id]/+page.server.ts     | 22 +++---
 src/routes/functor/[id]/+page.server.ts       | 34 ++-------
 src/routes/functors/+page.server.ts           |  4 +-
 src/routes/missing/+page.server.ts            | 12 +--
 19 files changed, 114 insertions(+), 178 deletions(-)

diff --git a/src/components/CategoryImplicationItem.svelte b/src/components/CategoryImplicationItem.svelte
index b563cb0d7..38b18fc42 100644
--- a/src/components/CategoryImplicationItem.svelte
+++ b/src/components/CategoryImplicationItem.svelte
@@ -7,9 +7,12 @@
 	} from '@fortawesome/free-solid-svg-icons'
 	import Fa from 'svelte-fa'
 	import { get_property_url } from '$lib/commons/property.url'
-	import type { ImplicationDisplay } from '$lib/commons/types'
+	import type { CategoryImplicationDisplay } from '$lib/commons/types'
 
-	type Props = { implication: ImplicationDisplay; highlighted_property?: string }
+	type Props = {
+		implication: CategoryImplicationDisplay
+		highlighted_property?: string
+	}
 
 	let { implication, highlighted_property }: Props = $props()
 </script>
diff --git a/src/components/CategoryImplicationList.svelte b/src/components/CategoryImplicationList.svelte
index b1151447d..daa90c3ed 100644
--- a/src/components/CategoryImplicationList.svelte
+++ b/src/components/CategoryImplicationList.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-	import type { ImplicationDisplay } from '$lib/commons/types'
+	import type { CategoryImplicationDisplay } from '$lib/commons/types'
 	import CategoryImplicationItem from './CategoryImplicationItem.svelte'
 
 	type Props = {
-		implications: ImplicationDisplay[]
+		implications: CategoryImplicationDisplay[]
 		highlighted_property?: string
 	}
 
diff --git a/src/lib/commons/types.ts b/src/lib/commons/types.ts
index 185160ce8..a9632a8de 100644
--- a/src/lib/commons/types.ts
+++ b/src/lib/commons/types.ts
@@ -4,6 +4,11 @@ export type Arrayed<T extends readonly unknown[]> = {
 
 type Replace<T, R extends Partial<Record<keyof T, any>>> = Omit<T, keyof R> & R
 
+export type EntityShort = {
+	id: string
+	name: string
+}
+
 export type CategoryDisplay = {
 	id: string
 	name: string
@@ -17,20 +22,13 @@ export type CategoryDisplay = {
 	dual_category_notation: string | null
 }
 
-export type EntityShort = {
-	id: string
-	name: string
-}
-
-export type CategoryShort = Pick<CategoryDisplay, 'id' | 'name'>
-
 export type RelatedCategory = Pick<CategoryDisplay, 'id' | 'name' | 'notation'>
 
 export type TagObject = { tag: string }
 
 export type CommentObject = { id: number; comment: string }
 
-export type ImplicationDB = {
+export type CategoryImplicationDB = {
 	id: string
 	is_equivalence: 0 | 1
 	reason: string
@@ -40,8 +38,8 @@ export type ImplicationDB = {
 	dualized_from?: string | null
 }
 
-export type ImplicationDisplay = Replace<
-	ImplicationDB,
+export type CategoryImplicationDisplay = Replace<
+	CategoryImplicationDB,
 	{
 		is_equivalence: boolean
 		is_deduced: boolean
@@ -50,6 +48,7 @@ export type ImplicationDisplay = Replace<
 	}
 >
 
+// used for both categories and functors
 export type PropertyDB = {
 	id: string
 	relation: string
@@ -66,19 +65,26 @@ export type PropertyDisplay = Replace<
 
 export type PropertyShort = Pick<PropertyDB, 'id' | 'relation'>
 
-export type DescriptionWithReason = {
-	description: string
-	reason: string | null
-}
-
-export type CategoryPropertyDB = {
+export type PropertyAssignmentDB = {
 	id: string
 	reason: string
 	relation: string
 	is_deduced: 0 | 1
+	is_satisfied: 0 | 1
 }
 
-export type CategoryProperty = Replace<CategoryPropertyDB, { is_deduced: boolean }>
+export type PropertyAssignmentDisplay = Replace<
+	PropertyAssignmentDB,
+	{
+		is_deduced: boolean
+		is_satisfied: boolean
+	}
+>
+
+export type DescriptionWithReason = {
+	description: string
+	reason: string | null
+}
 
 export type SpecialObject = {
 	type: string
@@ -93,11 +99,6 @@ export type SpecialMorphism = {
 
 export type Structure = 'categories' | 'functors'
 
-export type FunctorShort = {
-	id: string
-	name: string
-}
-
 export type FunctorDB = {
 	id: string
 	name: string
@@ -109,24 +110,6 @@ export type FunctorDB = {
 	nlab_link: string | null
 }
 
-export type FunctorPropertyDB = {
-	id: string
-	relation: string
-	description: string
-	nlab_link: string | null
-	invariant_under_equivalences: 0 | 1
-	dual_property_id: string | null
-}
-
-export type FunctorPropertyShort = Pick<FunctorPropertyDB, 'id' | 'relation'>
-
-export type FunctorProperty = Replace<
-	FunctorPropertyDB,
-	{
-		invariant_under_equivalences: boolean
-	}
->
-
 export type FunctorImplicationDB = {
 	id: string
 	is_equivalence: 0 | 1
@@ -148,15 +131,3 @@ export type FunctorImplicationDisplay = Replace<
 		target_assumptions: string[]
 	}
 >
-
-export type FunctorPropertyAssignmentDB = {
-	id: string
-	reason: string
-	relation: string
-	is_deduced: 0 | 1
-}
-
-export type FunctorPropertyAssignment = Replace<
-	FunctorPropertyAssignmentDB,
-	{ is_deduced: boolean }
->
diff --git a/src/lib/server/utils.ts b/src/lib/server/utils.ts
index 94318c578..ea47278e8 100644
--- a/src/lib/server/utils.ts
+++ b/src/lib/server/utils.ts
@@ -1,12 +1,12 @@
 import type {
 	FunctorImplicationDB,
 	FunctorImplicationDisplay,
-	FunctorProperty,
-	FunctorPropertyDB,
-	ImplicationDB,
-	ImplicationDisplay,
+	CategoryImplicationDB,
+	CategoryImplicationDisplay,
 	PropertyDB,
 	PropertyDisplay,
+	PropertyAssignmentDB,
+	PropertyAssignmentDisplay,
 } from '$lib/commons/types'
 
 export function is_object(obj: unknown): obj is Record<string, unknown> {
@@ -22,18 +22,7 @@ export function is_subset<T>(a: Set<T>, b: Set<T>) {
 
 export const sleep = (delay: number) => new Promise<void>((res) => setTimeout(res, delay))
 
-export function display_implication(implication: ImplicationDB): ImplicationDisplay {
-	return {
-		id: implication.id,
-		is_equivalence: Boolean(implication.is_equivalence),
-		reason: implication.reason,
-		is_deduced: Boolean(implication.is_deduced),
-		assumptions: JSON.parse(implication.assumptions),
-		conclusions: JSON.parse(implication.conclusions),
-		dualized_from: implication.dualized_from,
-	}
-}
-
+// this function is used for both categories and functors
 export function display_property(property: PropertyDB): PropertyDisplay {
 	return {
 		id: property.id,
@@ -45,14 +34,29 @@ export function display_property(property: PropertyDB): PropertyDisplay {
 	}
 }
 
-export function display_functor_property(property: FunctorPropertyDB): FunctorProperty {
+export function display_property_assignment(
+	property: PropertyAssignmentDB,
+): PropertyAssignmentDisplay {
 	return {
 		id: property.id,
+		reason: property.reason,
+		is_deduced: Boolean(property.is_deduced),
 		relation: property.relation,
-		description: property.description,
-		dual_property_id: property.dual_property_id,
-		nlab_link: property.nlab_link,
-		invariant_under_equivalences: Boolean(property.invariant_under_equivalences),
+		is_satisfied: Boolean(property.is_satisfied),
+	}
+}
+
+export function display_implication(
+	implication: CategoryImplicationDB,
+): CategoryImplicationDisplay {
+	return {
+		id: implication.id,
+		is_equivalence: Boolean(implication.is_equivalence),
+		reason: implication.reason,
+		is_deduced: Boolean(implication.is_deduced),
+		assumptions: JSON.parse(implication.assumptions),
+		conclusions: JSON.parse(implication.conclusions),
+		dualized_from: implication.dualized_from,
 	}
 }
 
diff --git a/src/routes/categories/+page.server.ts b/src/routes/categories/+page.server.ts
index 597e22e7e..8e827c405 100644
--- a/src/routes/categories/+page.server.ts
+++ b/src/routes/categories/+page.server.ts
@@ -1,10 +1,10 @@
-import type { CategoryShort, TagObject } from '$lib/commons/types'
+import type { EntityShort, TagObject } from '$lib/commons/types'
 import { batch } from '$lib/server/db.catdat'
 import { error } from '@sveltejs/kit'
 import sql from 'sql-template-tag'
 
 export const load = async () => {
-	const { results, err } = batch<[CategoryShort, TagObject]>([
+	const { results, err } = batch<[EntityShort, TagObject]>([
 		sql`SELECT id, name FROM categories ORDER BY lower(name)`,
 		sql`SELECT tag FROM tags ORDER BY id`,
 	])
diff --git a/src/routes/categories/[tag]/+page.server.ts b/src/routes/categories/[tag]/+page.server.ts
index 4183f5299..f37f2a0f2 100644
--- a/src/routes/categories/[tag]/+page.server.ts
+++ b/src/routes/categories/[tag]/+page.server.ts
@@ -1,4 +1,4 @@
-import type { CategoryShort, TagObject } from '$lib/commons/types'
+import type { EntityShort, TagObject } from '$lib/commons/types'
 import { query } from '$lib/server/db.catdat'
 import { error } from '@sveltejs/kit'
 import sql from 'sql-template-tag'
@@ -13,7 +13,7 @@ export const entries: EntryGenerator = async () => {
 export const load = async (event) => {
 	const tag = event.params.tag
 
-	const { rows: categories, err } = query<CategoryShort>(sql`
+	const { rows: categories, err } = query<EntityShort>(sql`
 		SELECT c.id, c.name FROM categories c
 		LEFT JOIN category_tag_assignments t ON c.id = t.category_id
 		WHERE t.tag = ${tag}
diff --git a/src/routes/category-comparison/+page.server.ts b/src/routes/category-comparison/+page.server.ts
index db74d8ddd..1ae2a0583 100644
--- a/src/routes/category-comparison/+page.server.ts
+++ b/src/routes/category-comparison/+page.server.ts
@@ -1,10 +1,10 @@
-import type { CategoryShort } from '$lib/commons/types'
+import type { EntityShort } from '$lib/commons/types'
 import sql from 'sql-template-tag'
 import { query } from '$lib/server/db.catdat'
 import { error } from '@sveltejs/kit'
 
 export const load = async () => {
-	const { rows: categories, err } = query<CategoryShort>(sql`
+	const { rows: categories, err } = query<EntityShort>(sql`
 		SELECT id, name FROM categories ORDER BY lower(name)
 	`)
 
diff --git a/src/routes/category-comparison/+page.svelte b/src/routes/category-comparison/+page.svelte
index e78abc1ef..71759e2c3 100644
--- a/src/routes/category-comparison/+page.svelte
+++ b/src/routes/category-comparison/+page.svelte
@@ -3,7 +3,7 @@
 	import { navigating } from '$app/state'
 	import MetaData from '$components/MetaData.svelte'
 	import Selection from '$components/Selection.svelte'
-	import type { CategoryShort } from '$lib/commons/types'
+	import type { EntityShort } from '$lib/commons/types'
 	import { MAX_CATEGORIES_COMPARE } from './compare.config'
 	import { get_compared_categories, save_comparison } from './compare.utils'
 
@@ -15,7 +15,7 @@
 		save_comparison(compared_categories)
 	})
 
-	let chosen_categories: CategoryShort[] = $derived(
+	let chosen_categories: EntityShort[] = $derived(
 		compared_categories
 			.map((name) => data.categories.find((category) => category.name === name))
 			.filter((category) => category !== undefined),
diff --git a/src/routes/category-implication/[id]/+page.server.ts b/src/routes/category-implication/[id]/+page.server.ts
index de3769bed..5b5115446 100644
--- a/src/routes/category-implication/[id]/+page.server.ts
+++ b/src/routes/category-implication/[id]/+page.server.ts
@@ -1,4 +1,4 @@
-import type { CategoryShort, ImplicationDB, ImplicationDisplay } from '$lib/commons/types'
+import type { EntityShort, CategoryImplicationDB } from '$lib/commons/types'
 import { batch } from '$lib/server/db.catdat'
 import { render_nested_formulas } from '$lib/server/formulas'
 import { display_implication } from '$lib/server/utils'
@@ -8,7 +8,7 @@ import sql from 'sql-template-tag'
 export const load = async (event) => {
 	const id = event.params.id
 
-	const { results, err } = batch<[ImplicationDB, CategoryShort]>([
+	const { results, err } = batch<[CategoryImplicationDB, EntityShort]>([
 		sql`
 			SELECT
 				id,
@@ -37,7 +37,7 @@ export const load = async (event) => {
 
 	if (!implications.length) error(404, `Could not find implication with ID '${id}'`)
 
-	const implication: ImplicationDisplay = display_implication(implications[0])
+	const implication = display_implication(implications[0])
 
 	return render_nested_formulas({ implication, categories })
 }
diff --git a/src/routes/category-implications/+page.server.ts b/src/routes/category-implications/+page.server.ts
index 9c1133491..568cfb9f4 100644
--- a/src/routes/category-implications/+page.server.ts
+++ b/src/routes/category-implications/+page.server.ts
@@ -2,11 +2,11 @@ import { render_nested_formulas } from '$lib/server/formulas'
 import { query } from '$lib/server/db.catdat'
 import sql from 'sql-template-tag'
 import { error } from '@sveltejs/kit'
-import type { ImplicationDB, ImplicationDisplay } from '$lib/commons/types'
+import type { CategoryImplicationDB } from '$lib/commons/types'
 import { display_implication } from '$lib/server/utils'
 
 export const load = async () => {
-	const { rows, err } = query<ImplicationDB>(sql`
+	const { rows, err } = query<CategoryImplicationDB>(sql`
 		SELECT
 			id,
 			is_equivalence,
@@ -20,7 +20,7 @@ export const load = async () => {
 
 	if (err) error(500, 'Could not load implications')
 
-	const implications: ImplicationDisplay[] = rows.map(display_implication)
+	const implications = rows.map(display_implication)
 
 	return render_nested_formulas({ implications })
 }
diff --git a/src/routes/category-property/[id]/+page.server.ts b/src/routes/category-property/[id]/+page.server.ts
index 4d06e2246..a5ac88c4c 100644
--- a/src/routes/category-property/[id]/+page.server.ts
+++ b/src/routes/category-property/[id]/+page.server.ts
@@ -3,8 +3,8 @@ import { render_nested_formulas } from '$lib/server/formulas'
 import { decode_property_ID } from '$lib/commons/property.url'
 import { batch } from '$lib/server/db.catdat'
 import sql from 'sql-template-tag'
-import type { CategoryShort, PropertyDB } from '$lib/commons/types'
-import type { ImplicationDB } from '$lib/commons/types'
+import type { EntityShort, PropertyDB } from '$lib/commons/types'
+import type { CategoryImplicationDB } from '$lib/commons/types'
 import { display_implication, display_property } from '$lib/server/utils'
 
 export const load = async (event) => {
@@ -14,9 +14,9 @@ export const load = async (event) => {
 		[
 			PropertyDB,
 			{ id: string },
-			ImplicationDB,
-			CategoryShort & { is_satisfied: 0 | 1 },
-			CategoryShort,
+			CategoryImplicationDB,
+			EntityShort & { is_satisfied: 0 | 1 },
+			EntityShort,
 		]
 	>([
 		// basic information
diff --git a/src/routes/category/[id]/+page.server.ts b/src/routes/category/[id]/+page.server.ts
index bfe6207e8..3a6bdfa3e 100644
--- a/src/routes/category/[id]/+page.server.ts
+++ b/src/routes/category/[id]/+page.server.ts
@@ -3,17 +3,17 @@ import { render_nested_formulas } from '$lib/server/formulas'
 import { batch } from '$lib/server/db.catdat'
 import sql from 'sql-template-tag'
 import type {
+	PropertyAssignmentDB,
 	CategoryDisplay,
-	CategoryProperty,
-	CategoryPropertyDB,
-	CategoryShort,
 	CommentObject,
 	PropertyShort,
 	RelatedCategory,
 	SpecialMorphism,
 	SpecialObject,
 	TagObject,
+	EntityShort,
 } from '$lib/commons/types'
+import { display_property_assignment } from '$lib/server/utils'
 
 export const load = async (event) => {
 	const id = event.params.id
@@ -23,11 +23,11 @@ export const load = async (event) => {
 			CategoryDisplay,
 			RelatedCategory,
 			TagObject,
-			CategoryPropertyDB & { is_satisfied: 0 | 1 },
+			PropertyAssignmentDB,
 			PropertyShort,
 			SpecialObject,
 			SpecialMorphism,
-			CategoryShort,
+			EntityShort,
 			CommentObject,
 		]
 	>([
@@ -159,23 +159,13 @@ export const load = async (event) => {
 	const category = categories[0]
 	const tags = tag_objects.map(({ tag }) => tag)
 
-	const satisfied_properties: CategoryProperty[] = properties_db
+	const satisfied_properties = properties_db
 		.filter((obj) => obj.is_satisfied)
-		.map((p) => ({
-			id: p.id,
-			reason: p.reason,
-			is_deduced: Boolean(p.is_deduced),
-			relation: p.relation,
-		}))
+		.map(display_property_assignment)
 
-	const unsatisfied_properties: CategoryProperty[] = properties_db
+	const unsatisfied_properties = properties_db
 		.filter((obj) => !obj.is_satisfied)
-		.map((p) => ({
-			id: p.id,
-			reason: p.reason,
-			is_deduced: Boolean(p.is_deduced),
-			relation: p.relation,
-		}))
+		.map(display_property_assignment)
 
 	return render_nested_formulas({
 		category,
diff --git a/src/routes/content/[id]/+page.server.ts b/src/routes/content/[id]/+page.server.ts
index ceef65487..5ffd598cf 100644
--- a/src/routes/content/[id]/+page.server.ts
+++ b/src/routes/content/[id]/+page.server.ts
@@ -3,7 +3,7 @@ import { error } from '@sveltejs/kit'
 import type { EntryGenerator } from './$types'
 import { batch } from '$lib/server/db.catdat'
 import sql from 'sql-template-tag'
-import type { CategoryShort, PropertyShort } from '$lib/commons/types'
+import type { EntityShort, PropertyShort } from '$lib/commons/types'
 
 export const entries: EntryGenerator = () => {
 	return content_ids.map((id) => ({ id }))
@@ -15,7 +15,7 @@ export const load = async (event) => {
 	if (!content) error(404, 'Not Found')
 
 	const { results, err: err_categories } = batch<
-		[CategoryShort, PropertyShort, { id: string }]
+		[EntityShort, PropertyShort, { id: string }]
 	>([
 		sql`
 			SELECT c.id, c.name FROM categories c
diff --git a/src/routes/functor-implication/[id]/+page.server.ts b/src/routes/functor-implication/[id]/+page.server.ts
index d78c3753a..868a93fc8 100644
--- a/src/routes/functor-implication/[id]/+page.server.ts
+++ b/src/routes/functor-implication/[id]/+page.server.ts
@@ -2,11 +2,7 @@ import { render_nested_formulas } from '$lib/server/formulas'
 import { batch } from '$lib/server/db.catdat'
 import sql from 'sql-template-tag'
 import { error } from '@sveltejs/kit'
-import type {
-	FunctorImplicationDB,
-	FunctorImplicationDisplay,
-	FunctorShort,
-} from '$lib/commons/types'
+import type { FunctorImplicationDB, EntityShort } from '$lib/commons/types'
 import { display_functor_implication } from '$lib/server/utils'
 
 export const prerender = true
@@ -14,7 +10,7 @@ export const prerender = true
 export const load = async (event) => {
 	const id = event.params.id
 
-	const { results, err } = batch<[FunctorImplicationDB, FunctorShort]>([
+	const { results, err } = batch<[FunctorImplicationDB, EntityShort]>([
 		sql`
             SELECT
                 id,
@@ -44,9 +40,7 @@ export const load = async (event) => {
 
 	if (!implications.length) error(404, `Could not find implication with ID '${id}'`)
 
-	const implication: FunctorImplicationDisplay = display_functor_implication(
-		implications[0],
-	)
+	const implication = display_functor_implication(implications[0])
 
 	return render_nested_formulas({ implication, functors })
 }
diff --git a/src/routes/functor-implications/+page.server.ts b/src/routes/functor-implications/+page.server.ts
index 5c5f151c1..66469dc3c 100644
--- a/src/routes/functor-implications/+page.server.ts
+++ b/src/routes/functor-implications/+page.server.ts
@@ -2,7 +2,7 @@ import { render_nested_formulas } from '$lib/server/formulas'
 import { query } from '$lib/server/db.catdat'
 import sql from 'sql-template-tag'
 import { error } from '@sveltejs/kit'
-import type { FunctorImplicationDB, FunctorImplicationDisplay } from '$lib/commons/types'
+import type { FunctorImplicationDB } from '$lib/commons/types'
 import { display_functor_implication } from '$lib/server/utils'
 
 export const prerender = true
@@ -23,9 +23,7 @@ export const load = async () => {
 
 	if (err) error(500, 'Could not load implications')
 
-	const implications: FunctorImplicationDisplay[] = rows.map(
-		display_functor_implication,
-	)
+	const implications = rows.map(display_functor_implication)
 
 	return render_nested_formulas({ implications })
 }
diff --git a/src/routes/functor-property/[id]/+page.server.ts b/src/routes/functor-property/[id]/+page.server.ts
index bfd8fa013..a0e0f9e26 100644
--- a/src/routes/functor-property/[id]/+page.server.ts
+++ b/src/routes/functor-property/[id]/+page.server.ts
@@ -1,13 +1,8 @@
 import { decode_property_ID } from '$lib/commons/property.url'
-import type {
-	FunctorImplicationDB,
-	FunctorImplicationDisplay,
-	FunctorPropertyDB,
-	FunctorShort,
-} from '$lib/commons/types'
+import type { FunctorImplicationDB, EntityShort, PropertyDB } from '$lib/commons/types'
 import { batch } from '$lib/server/db.catdat'
 import { render_nested_formulas } from '$lib/server/formulas'
-import { display_functor_implication, display_functor_property } from '$lib/server/utils'
+import { display_functor_implication, display_property } from '$lib/server/utils'
 import { error } from '@sveltejs/kit'
 import sql from 'sql-template-tag'
 
@@ -16,10 +11,10 @@ export const load = async (event) => {
 
 	const { results, err } = batch<
 		[
-			FunctorPropertyDB,
+			PropertyDB,
 			FunctorImplicationDB,
-			FunctorShort & { is_satisfied: 0 | 1 },
-			FunctorShort,
+			EntityShort & { is_satisfied: 0 | 1 },
+			EntityShort,
 		]
 	>([
 		// basic information
@@ -89,10 +84,11 @@ export const load = async (event) => {
 
 	if (!properties.length) error(404, `There is no property with ID '${id}'`)
 
-	const property = display_functor_property(properties[0])
+	const property = display_property(properties[0])
 
-	const relevant_implications: FunctorImplicationDisplay[] =
-		relevant_implications_db.map(display_functor_implication)
+	const relevant_implications = relevant_implications_db.map(
+		display_functor_implication,
+	)
 
 	const examples = known_functors.filter((f) => f.is_satisfied)
 	const counterexamples = known_functors.filter((f) => !f.is_satisfied)
diff --git a/src/routes/functor/[id]/+page.server.ts b/src/routes/functor/[id]/+page.server.ts
index cbbc588d8..0eb603afd 100644
--- a/src/routes/functor/[id]/+page.server.ts
+++ b/src/routes/functor/[id]/+page.server.ts
@@ -1,11 +1,7 @@
-import type {
-	FunctorDB,
-	FunctorPropertyAssignment,
-	FunctorPropertyAssignmentDB,
-	FunctorPropertyShort,
-} from '$lib/commons/types'
+import type { FunctorDB, PropertyAssignmentDB, PropertyShort } from '$lib/commons/types'
 import { batch } from '$lib/server/db.catdat'
 import { render_nested_formulas } from '$lib/server/formulas'
+import { display_property_assignment } from '$lib/server/utils'
 import { error } from '@sveltejs/kit'
 import sql from 'sql-template-tag'
 
@@ -14,13 +10,7 @@ import sql from 'sql-template-tag'
 export const load = async (event) => {
 	const id = event.params.id
 
-	const { results, err } = batch<
-		[
-			FunctorDB,
-			FunctorPropertyAssignmentDB & { is_satisfied: 0 | 1 },
-			FunctorPropertyShort,
-		]
-	>([
+	const { results, err } = batch<[FunctorDB, PropertyAssignmentDB, PropertyShort]>([
 		sql`
             SELECT
                 f.id,
@@ -75,23 +65,13 @@ export const load = async (event) => {
 
 	const [functor] = functors
 
-	const satisfied_properties: FunctorPropertyAssignment[] = properties_db
+	const satisfied_properties = properties_db
 		.filter((obj) => obj.is_satisfied)
-		.map((p) => ({
-			id: p.id,
-			reason: p.reason,
-			is_deduced: Boolean(p.is_deduced),
-			relation: p.relation,
-		}))
+		.map(display_property_assignment)
 
-	const unsatisfied_properties: FunctorPropertyAssignment[] = properties_db
+	const unsatisfied_properties = properties_db
 		.filter((obj) => !obj.is_satisfied)
-		.map((p) => ({
-			id: p.id,
-			reason: p.reason,
-			is_deduced: Boolean(p.is_deduced),
-			relation: p.relation,
-		}))
+		.map(display_property_assignment)
 
 	return render_nested_formulas({
 		functor,
diff --git a/src/routes/functors/+page.server.ts b/src/routes/functors/+page.server.ts
index 7377042b3..df00eda81 100644
--- a/src/routes/functors/+page.server.ts
+++ b/src/routes/functors/+page.server.ts
@@ -1,4 +1,4 @@
-import type { FunctorShort } from '$lib/commons/types'
+import type { EntityShort } from '$lib/commons/types'
 import { query } from '$lib/server/db.catdat'
 import { error } from '@sveltejs/kit'
 import sql from 'sql-template-tag'
@@ -6,7 +6,7 @@ import sql from 'sql-template-tag'
 export const prerender = true
 
 export const load = async () => {
-	const { rows: functors, err } = query<FunctorShort>(
+	const { rows: functors, err } = query<EntityShort>(
 		sql`SELECT id, name FROM functors ORDER BY lower(name)`,
 	)
 
diff --git a/src/routes/missing/+page.server.ts b/src/routes/missing/+page.server.ts
index bd2bf6c38..673c753f2 100644
--- a/src/routes/missing/+page.server.ts
+++ b/src/routes/missing/+page.server.ts
@@ -1,18 +1,18 @@
 import { batch } from '$lib/server/db.catdat'
 import sql from 'sql-template-tag'
-import type { CategoryShort, FunctorShort } from '$lib/commons/types'
+import type { EntityShort } from '$lib/commons/types'
 import { error } from '@sveltejs/kit'
 import { get_missing_combinations } from '$lib/server/consistency'
 
-type CategoryPairShort = { id1: string; name1: string; id2: string; name2: string }
+type EntityPairShort = { id1: string; name1: string; id2: string; name2: string }
 
 export const load = async () => {
 	const { results, err } = batch<
 		[
-			CategoryShort & { count: number },
-			CategoryShort & { count: number },
-			CategoryPairShort,
-			FunctorShort & { count: number },
+			EntityShort & { count: number },
+			EntityShort & { count: number },
+			EntityPairShort,
+			EntityShort & { count: number },
 		]
 	>([
 		// categories with unknown properties