various small improvements concerning unification

Author: ScriptRaccoon

databases/catdat/scripts/config.ts

@@ -5,4 +5,6 @@ export const PLURALS = {
 	functor: 'functors',
 } as const
 
+export const STRUCTURES: StructureType[] = ['category', 'functor']
+
 export const STRUCTURES_WITH_DUALS: StructureType[] = ['category']

databases/catdat/scripts/deduce-implications.ts

@@ -8,6 +8,7 @@ const db = get_client()
  * Clears all deduced implications. This is done before the deduction starts.
  */
 export function clear_deduced_implications(type: StructureType) {
+	console.info(`\n--- Deduce ${type} implications ---`)
 	db.prepare(`DELETE FROM implications WHERE is_deduced = TRUE AND type = ?`).run(type)
 }
 

databases/catdat/scripts/seed.ts

@@ -11,7 +11,7 @@ import type {
 	PropertyYaml,
 } from './utils/seed.types'
 import { create_schema_hash, get_saved_schema_hash } from './utils/schema'
-import { PLURALS, type StructureType } from './config'
+import { PLURALS, STRUCTURES, type StructureType } from './config'
 
 const db = get_client()
 
@@ -115,17 +115,14 @@ function seed_config() {
 	)
 
 	function insert_config(config: ConfigYaml) {
-		for (const tag of config.shared_tags) {
-			tag_insert.run(tag, 'category')
-			tag_insert.run(tag, 'functor')
-		}
-
-		for (const tag of config.category_tags) {
-			tag_insert.run(tag, 'category')
-		}
+		for (const type of STRUCTURES) {
+			for (const tag of config.shared_tags) {
+				tag_insert.run(tag, type)
+			}
 
-		for (const tag of config.functor_tags) {
-			tag_insert.run(tag, 'functor')
+			for (const tag of config[`${type}_tags`]) {
+				tag_insert.run(tag, type)
+			}
 		}
 
 		for (const { relation, conditional } of config.relations) {

databases/catdat/scripts/utils/structures.ts

@@ -3,13 +3,12 @@ import { StructureType } from '../config'
 import { parse_json_set } from './helpers'
 
 /**
- * A structure is a category or a functor.
+ * Type for various types of categorical structures (category, functor, ...)
  */
 export type StructureMeta = {
 	id: string
 	name: string
 	dual?: string | null
-	// used for source and target properties of a functor
 	associated_satisfied_properties?: Record<string, Set<string>>
 }
 

src/lib/commons/structures.ts

@@ -6,3 +6,12 @@ export const PLURALS = {
 	category: 'categories',
 	functor: 'functors',
 }
+
+export function get_selected_type(pathname: string): StructureType {
+	for (const type of STRUCTURES) {
+		const matches =
+			pathname.startsWith(`/${type}`) || pathname.startsWith(`/${PLURALS[type]}`)
+		if (matches) return type
+	}
+	return 'category'
+}

src/routes/+layout.svelte

@@ -7,6 +7,7 @@
 	import NavMobile from '$components/NavMobile.svelte'
 	import Popup from '$components/Popup.svelte'
 	import { track_visit } from '$lib/client/track'
+	import { get_selected_type } from '$lib/commons/structures'
 	import type { StructureType } from '$lib/commons/types'
 	import { tracking } from '$lib/states/tracking.svelte'
 	import './app.css'
@@ -31,20 +32,7 @@
 
 	let nav_dialog = $state<HTMLDialogElement | null>(null)
 
-	let selected_type = $state<StructureType>(
-		page.url.pathname.startsWith('/functor') ? 'functor' : 'category',
-	)
-
-	$effect(() => {
-		if (page.url.pathname.startsWith('/functor')) {
-			selected_type = 'functor'
-		} else if (
-			page.url.pathname.startsWith('/category') ||
-			page.url.pathname.startsWith('/categories')
-		) {
-			selected_type = 'category'
-		}
-	})
+	let selected_type = $derived<StructureType>(get_selected_type(page.url.pathname))
 </script>
 
 <svelte:head>