refactoring of scripts

Author: ScriptRaccoon

databases/catdat/scripts/config.ts

@@ -5,6 +5,7 @@ export const PLURALS = {
 	functor: 'functors',
 } as const
 
+// TODO: integrate this into schema
 export const STRUCTURE_MAPS = [
 	['source', 'functor', 'category'],
 	['target', 'functor', 'category'],

databases/catdat/scripts/deduce-implications.ts

@@ -1,5 +1,6 @@
 import { STRUCTURE_MAPS, STRUCTURES_WITH_DUALS, type StructureType } from './config'
-import { are_equal_sets, get_client, parse_json_set } from './utils/helpers'
+import { are_equal_sets, parse_json_set } from './utils/helpers'
+import { get_client } from './utils/db'
 
 const db = get_client()
 
@@ -24,9 +25,9 @@ export function create_dualized_implications(type: StructureType) {
 			assumptions: string
 			conclusions: string
 			dual_assumptions: string
+			dual_conclusions: string
 			dual_source_assumptions: string
 			dual_target_assumptions: string
-			dual_conclusions: string
 		}
 	>(
 		`SELECT
@@ -42,22 +43,22 @@ export function create_dualized_implications(type: StructureType) {
 			) AS dual_assumptions,
 			(
 				SELECT json_group_array(p.dual_property_id)
-				FROM source_assumptions a
+				FROM conclusions a
 				LEFT JOIN properties p ON p.id = a.property_id
 				WHERE a.implication_id = i.id
-			) AS dual_source_assumptions,
+			) AS dual_conclusions,
 			(
 				SELECT json_group_array(p.dual_property_id)
-				FROM target_assumptions a
+				FROM source_assumptions a
 				LEFT JOIN properties p ON p.id = a.property_id
 				WHERE a.implication_id = i.id
-			) AS dual_target_assumptions,
+			) AS dual_source_assumptions,
 			(
 				SELECT json_group_array(p.dual_property_id)
-				FROM conclusions a
+				FROM target_assumptions a
 				LEFT JOIN properties p ON p.id = a.property_id
 				WHERE a.implication_id = i.id
-			) AS dual_conclusions
+			) AS dual_target_assumptions
 		FROM implications_view i
 		WHERE i.type = ? AND i.is_deduced = FALSE`,
 	)
@@ -92,7 +93,7 @@ export function create_dualized_implications(type: StructureType) {
 		VALUES (?, ?, ?, ?)
 	`)
 
-	const mapped_assumption_inserts = {
+	const associated_assumption_inserts = {
 		source: source_assumption_insert,
 		target: target_assumption_insert,
 	}
@@ -124,7 +125,7 @@ export function create_dualized_implications(type: StructureType) {
 
 			count++
 
-			const mapped_dual_assumptions = {
+			const associated_dual_assumptions = {
 				source: dual_source_assumptions,
 				target: dual_target_assumptions,
 			}
@@ -149,8 +150,8 @@ export function create_dualized_implications(type: StructureType) {
 				const [name, from, to] = map
 				if (from !== type) continue
 
-				for (const assumption of mapped_dual_assumptions[name] ?? []) {
-					mapped_assumption_inserts[name].run(dual_id, assumption, type, to)
+				for (const assumption of associated_dual_assumptions[name] ?? []) {
+					associated_assumption_inserts[name].run(dual_id, assumption, type, to)
 				}
 			}
 		}
@@ -169,7 +170,9 @@ export function create_self_dual_implications(type: StructureType) {
 
 	const relevant_props = db
 		.prepare<[StructureType], { id: string; dual: string }>(
-			`SELECT id, dual_property_id AS dual
+			`SELECT
+				id,
+				dual_property_id AS dual
 			FROM properties
 			WHERE
 				type = ?
@@ -180,17 +183,20 @@ export function create_self_dual_implications(type: StructureType) {
 		.all(type)
 
 	const implication_insert = db.prepare(`
-		INSERT INTO implications (id, type, proof, is_deduced)
+		INSERT INTO implications
+			(id, type, proof, is_deduced)
 		VALUES (?, ?, 'This holds by self-duality.', TRUE)	
 	`)
 
 	const assumption_insert = db.prepare(`
-		INSERT INTO assumptions (implication_id, property_id, type)
+		INSERT INTO assumptions
+			(implication_id, property_id, type)
 		VALUES (?, ?, ?)
 	`)
 
 	const conclusion_insert = db.prepare(`
-		INSERT INTO conclusions (implication_id, property_id, type)
+		INSERT INTO conclusions
+			(implication_id, property_id, type)
 		VALUES (?, ?, ?)
 	`)
 

databases/catdat/scripts/deduce-special-morphisms.ts

@@ -1,4 +1,4 @@
-import { get_client } from './utils/helpers'
+import { get_client } from './utils/db'
 
 const db = get_client()
 

databases/catdat/scripts/deduce-special-objects.ts

@@ -1,4 +1,4 @@
-import { get_client } from './utils/helpers'
+import { get_client } from './utils/db'
 
 const db = get_client()
 

databases/catdat/scripts/deduce-structure-properties.ts

@@ -4,22 +4,21 @@
  */
 
 import { type Database, SqliteError } from 'better-sqlite3'
-import { get_client, is_subset } from './utils/helpers'
+import { is_subset } from './utils/helpers'
+import { get_client } from './utils/db'
 import {
-	get_structures,
 	get_properties_dict,
 	get_property_assignments,
-	is_dual_structure,
-	type StructureMeta,
 	type PropertyMeta,
-} from './utils/deduction'
+} from './utils/properties'
 import {
 	get_contradiction_string,
 	get_normalized_implications,
 	get_proof_string,
 	NormalizedImplication,
 } from './utils/implications'
 import { STRUCTURES_WITH_DUALS, type StructureType } from './config'
+import { get_structures, is_dual_structure, type StructureMeta } from './utils/structures'
 
 /**
  * Returns the set of satisfied properties that can be deduced from a set
@@ -389,9 +388,8 @@ function delete_deduced_properties(db: Database, type: StructureType) {
 }
 
 /**
- * --- MAIN FUNCTION ---
- * Deduce properties of structures from given ones
- * by using the list of implications.
+ * Main function: Deduce properties of structures from given ones
+ * by using the stored implications.
  */
 export function deduce_properties_for_structures(type: StructureType) {
 	console.info(`\n--- Deduce ${type} properties ---`)

databases/catdat/scripts/proof-length.ts

@@ -1,5 +1,5 @@
 import { type StructureType } from './config'
-import { get_client } from './utils/helpers'
+import { get_client } from './utils/db'
 
 const db = get_client()
 

databases/catdat/scripts/redundancies.ts

@@ -1,18 +1,15 @@
-import { get_client } from './utils/helpers'
+import { get_client } from './utils/db'
 import {
 	get_deduced_satisfied_properties,
 	get_deduced_unsatisfied_properties,
 } from './deduce-structure-properties'
-import {
-	get_property_assignments_by_deduction,
-	get_structures,
-	StructureMeta,
-} from './utils/deduction'
+import { get_property_assignments_by_deduction } from './utils/properties'
 import type { StructureType } from './config'
 import {
 	get_normalized_implications,
 	type NormalizedImplication,
 } from './utils/implications'
+import { get_structures } from './utils/structures'
 
 const db = get_client()
 
@@ -37,7 +34,7 @@ function check_redundant_property_assignments(type: StructureType) {
 
 	const implications = get_normalized_implications(db, type)
 
-	const structures: StructureMeta[] = get_structures(db, type)
+	const structures = get_structures(db, type)
 
 	const assignments = get_property_assignments_by_deduction(db, structures, type)
 	const ignore_dict = get_ignored_redundant_assignments(type)

databases/catdat/scripts/restrict-functor-properties.ts

@@ -1,4 +1,4 @@
-import { get_client } from './utils/helpers'
+import { get_client } from './utils/db'
 
 const db = get_client()
 

databases/catdat/scripts/seed.ts

@@ -1,5 +1,6 @@
 import path from 'node:path'
-import { get_client, seed_file, seed_files } from './utils/helpers'
+import { seed_file, seed_files } from './utils/seed.helpers'
+import { get_client } from './utils/db'
 import type {
 	CategoryYaml,
 	ConfigYaml,
@@ -8,7 +9,7 @@ import type {
 	PropertyEntry,
 	StructureYaml,
 	PropertyYaml,
-} from './seed.types'
+} from './utils/seed.types'
 import { create_schema_hash, get_saved_schema_hash } from './utils/schema'
 import { PLURALS, STRUCTURE_MAPS, type StructureType } from './config'
 

databases/catdat/scripts/setup.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
-import { get_client } from './utils/helpers'
+import { get_client } from './utils/db'
 import { create_schema_hash, write_schema_hash } from './utils/schema'
 
 const schema_folder = path.resolve('databases', 'catdat', 'schema')