From 5f8484f8baec7422b68fcac44e273442fd3f592e Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Mon, 20 Mar 2023 06:25:20 -0700
Subject: [PATCH 01/12] Update oracle node types to use UUIDs

---
 src/module/features/customoracles.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/module/features/customoracles.ts b/src/module/features/customoracles.ts
index 8c7a76083..54876a701 100644
--- a/src/module/features/customoracles.ts
+++ b/src/module/features/customoracles.ts
@@ -11,7 +11,7 @@ import { cachedDocumentsForPack } from './pack-cache'
 
 export interface IOracleTreeNode {
 	dataforgedNode?: IOracle | IOracleCategory
-	tables: Array<() => RollTable>
+	tables: string[] // UUIDs
 	displayName: string
 	children: IOracleTreeNode[]
 	forceExpanded?: boolean
@@ -107,9 +107,9 @@ export async function walkOracle(
 	const node: IOracleTreeNode = {
 		...emptyNode(),
 		dataforgedNode: oracle,
-		tables: compact([table != null ? () => table : undefined]),
+		tables: compact([table?.uuid]),
 		displayName:
-			table?.name ||
+			table?.name ??
 			game.i18n.localize(`IRONSWORN.OracleCategories.${oracle.Name}`)
 	}
 
@@ -127,7 +127,7 @@ export async function walkOracle(
 				node.children.push({
 					...emptyNode(),
 					displayName: name,
-					tables: [() => subtable]
+					tables: [subtable.uuid]
 				})
 			}
 		}
@@ -155,7 +155,7 @@ async function augmentWithFolderContents(node: IOracleTreeNode) {
 		// Add this folder
 		const newNode: IOracleTreeNode = {
 			...emptyNode(),
-			displayName: folder.name || '(folder)'
+			displayName: folder.name ?? '(folder)'
 		}
 		parent.children.push(newNode)
 
@@ -168,7 +168,7 @@ async function augmentWithFolderContents(node: IOracleTreeNode) {
 		for (const table of folder.contents) {
 			newNode.children.push({
 				...emptyNode(),
-				tables: [() => table as RollTable],
+				tables: [table.uuid],
 				displayName: table.name ?? '(table)'
 			})
 		}
@@ -177,14 +177,14 @@ async function augmentWithFolderContents(node: IOracleTreeNode) {
 	walkFolder(node, rootFolder)
 }
 
-export function findPathToNodeByTableId(
+export function findPathToNodeByTableUuid(
 	rootNode: IOracleTreeNode,
-	tableId: string
+	tableUuid: string
 ): IOracleTreeNode[] {
 	const ret: IOracleTreeNode[] = []
 	function walk(node: IOracleTreeNode) {
 		ret.push(node)
-		const foundTable = node.tables.find((x) => x().id === tableId)
+		const foundTable = node.tables.find((x) => x === tableUuid)
 		if (foundTable != null) return true
 		for (const child of node.children) {
 			if (walk(child)) return true

From 534a6041fe1dd70c2ec71a3e31232d2763a8e173 Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Fri, 24 Mar 2023 20:13:47 -0700
Subject: [PATCH 02/12] Resolve some issues

---
 src/module/rolls/oracle-roll-message.ts          | 9 ++++-----
 src/module/vue/components/buttons/btn-oracle.vue | 2 +-
 src/module/vue/components/oracle-tree-node.vue   | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/module/rolls/oracle-roll-message.ts b/src/module/rolls/oracle-roll-message.ts
index 879c34b32..25eba6adf 100644
--- a/src/module/rolls/oracle-roll-message.ts
+++ b/src/module/rolls/oracle-roll-message.ts
@@ -6,7 +6,7 @@ import {
 	createIronswornOracleTree,
 	createStarforgedOracleTree,
 	findPathToNodeByDfId,
-	findPathToNodeByTableId
+	findPathToNodeByTableUuid
 } from '../features/customoracles'
 
 export interface TableRow {
@@ -172,16 +172,15 @@ export class OracleRollMessage {
 	}
 
 	private async oraclePath(): Promise<string | undefined> {
-		if (!this.tableUuid) return undefined
-		const uuid = _parseUuid(this.tableUuid)
+		if (this.tableUuid == null) return undefined
 
 		const [starforgedRoot, ironswornRooot] = await Promise.all([
 			createStarforgedOracleTree(),
 			createIronswornOracleTree()
 		])
 		const pathElements =
-			findPathToNodeByTableId(starforgedRoot, uuid.documentId!) ??
-			findPathToNodeByTableId(ironswornRooot, uuid.documentId!)
+			findPathToNodeByTableUuid(starforgedRoot, this.tableUuid) ??
+			findPathToNodeByTableUuid(ironswornRooot, this.tableUuid)
 		pathElements.shift() // no display name for root node
 		pathElements.pop() // last node is the table we rolled
 		return pathElements.map((x) => x.displayName).join(' / ')
diff --git a/src/module/vue/components/buttons/btn-oracle.vue b/src/module/vue/components/buttons/btn-oracle.vue
index 43f07ed85..62ca5669b 100644
--- a/src/module/vue/components/buttons/btn-oracle.vue
+++ b/src/module/vue/components/buttons/btn-oracle.vue
@@ -39,7 +39,7 @@ async function rollOracle() {
 	if (props.overrideClick && props.onClick) return $emit('click')
 
 	const randomTable = sample(props.node.tables)
-	const orm = await OracleRollMessage.fromTableUuid(randomTable?.()?.uuid ?? '')
+	const orm = await OracleRollMessage.fromTableUuid(randomTable ?? '')
 	orm.createOrUpdate()
 }
 </script>
diff --git a/src/module/vue/components/oracle-tree-node.vue b/src/module/vue/components/oracle-tree-node.vue
index 0e6a8a13b..4d0d24f50 100644
--- a/src/module/vue/components/oracle-tree-node.vue
+++ b/src/module/vue/components/oracle-tree-node.vue
@@ -24,7 +24,7 @@
 				<RulesTextOracle
 					v-if="state.descriptionExpanded"
 					:class="$style.content"
-					:oracle-table="node.tables[0]"
+					:oracle-table-uuid="node.tables[0]"
 					:source="node.dataforgedNode?.Source"
 					@moveclick="moveclick"
 					@oracleclick="oracleclick" />

From 35a66919378c03518ff4399a1c406b8b17ed6d0e Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Sat, 25 Mar 2023 06:22:05 -0700
Subject: [PATCH 03/12] Expandable oracles

---
 .../vue/components/rules-text/oracle-table.vue       | 12 ++++++++----
 .../vue/components/rules-text/rules-text-oracle.vue  |  7 +++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/module/vue/components/rules-text/oracle-table.vue b/src/module/vue/components/rules-text/oracle-table.vue
index a0cae8d6b..74d6f33ed 100644
--- a/src/module/vue/components/rules-text/oracle-table.vue
+++ b/src/module/vue/components/rules-text/oracle-table.vue
@@ -1,8 +1,8 @@
 <template>
 	<table class="oracle-table">
 		<caption
-			v-if="!noCaption && oracleTable().description"
-			v-html="enrichMarkdown(oracleTable().description ?? '')" />
+			v-if="!noCaption && rollTable?.description"
+			v-html="enrichMarkdown(rollTable?.description ?? '')" />
 		<thead>
 			<tr>
 				<th scope="col" class="oracle-table-column-roll-range">
@@ -31,10 +31,14 @@ import { enrichMarkdown } from '../../vue-plugin.js'
 
 // FIXME: use v10 types when available, or hack some together for tables
 const props = defineProps<{
-	oracleTable: () => any
+	oracleTableUuid: string
 	noCaption?: boolean
 }>()
 
+const rollTable = (await fromUuid(props.oracleTableUuid)) as
+	| (RollTable & { description?: string })
+	| undefined
+
 type TableRowData = {
 	low: number
 	high: number
@@ -50,7 +54,7 @@ function rangeString({ low, high }: TableRowData) {
 }
 const tableRows = computed(() =>
 	sortBy(
-		props.oracleTable().results.contents.map(
+		(rollTable?.results?.contents ?? []).map(
 			(row: any) =>
 				({
 					low: row.range[0],
diff --git a/src/module/vue/components/rules-text/rules-text-oracle.vue b/src/module/vue/components/rules-text/rules-text-oracle.vue
index 150f193ea..3cfdadb58 100644
--- a/src/module/vue/components/rules-text/rules-text-oracle.vue
+++ b/src/module/vue/components/rules-text/rules-text-oracle.vue
@@ -1,7 +1,7 @@
 <template>
 	<RulesText class="rules-text-oracle" :source="source" type="slot">
 		<template #default>
-			<OracleTable :oracle-table="oracleTable" />
+			<OracleTable :oracle-table-uuid="oracleTableUuid" />
 		</template>
 		<template #before-main>
 			<slot name="before-main"></slot>
@@ -20,5 +20,8 @@ import RulesText from './rules-text.vue'
 import OracleTable from './oracle-table.vue'
 import type { ISource } from 'dataforged'
 
-const props = defineProps<{ oracleTable: () => RollTable; source?: ISource }>()
+const props = defineProps<{
+	oracleTableUuid: string
+	source?: ISource
+}>()
 </script>

From 8ec37b85cd57641ffbf30de5815b902bf99722b9 Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Sat, 25 Mar 2023 07:05:27 -0700
Subject: [PATCH 04/12] API for static oracle trees

---
 src/config.ts                        | 15 ++++++-
 src/index.ts                         |  3 ++
 src/module/features/customoracles.ts | 59 +++++++++++++++++++++++++---
 3 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/src/config.ts b/src/config.ts
index daeb8f048..5c4134842 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -15,6 +15,10 @@ import { FirstStartDialog } from './module/applications/firstStartDialog'
 import { SFSettingTruthsDialogVue } from './module/applications/vueSfSettingTruthsDialog'
 import { WorldTruthsDialog } from './module/applications/worldTruthsDialog'
 import { OracleWindow } from './module/applications/oracle-window'
+import {
+	getOracleTree,
+	registerOracleTree
+} from './module/features/customoracles'
 
 export interface EmitterEvents extends Record<EventType, unknown> {
 	highlightMove: string // Foundry UUID
@@ -27,7 +31,6 @@ export type IronswornEmitter = Emitter<EmitterEvents>
 
 export interface IronswornConfig {
 	actorClass: typeof IronswornActor
-	importFromDatasworn: typeof importFromDatasworn
 
 	applications: {
 		// Dialogs
@@ -44,10 +47,15 @@ export interface IronswornConfig {
 		OracleRollMessage: typeof OracleRollMessage
 	}
 
+	importFromDatasworn: typeof importFromDatasworn
+
 	Dataforged: typeof starforged
 	dataforgedHelpers: typeof dataforgedHelpers
 
 	emitter: IronswornEmitter
+
+	registerOracleTree: typeof registerOracleTree
+	getOracleTree: typeof getOracleTree
 }
 
 export const IRONSWORN: IronswornConfig = {
@@ -71,5 +79,8 @@ export const IRONSWORN: IronswornConfig = {
 	Dataforged: starforged,
 	dataforgedHelpers,
 
-	emitter: Mitt<EmitterEvents>()
+	emitter: Mitt<EmitterEvents>(),
+
+	registerOracleTree,
+	getOracleTree
 }
diff --git a/src/index.ts b/src/index.ts
index 4f54ad610..519149fdc 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -38,6 +38,7 @@ import { registerTours } from './module/features/tours'
 import { CompactPCSheet } from './module/actor/sheets/compact-pc-sheet'
 
 import 'virtual:svg-icons-register'
+import { registerDefaultOracleTrees } from './module/features/customoracles'
 
 declare global {
 	interface LenientGlobalVariableTypes {
@@ -221,6 +222,8 @@ Hooks.once('init', async () => {
 	registerCompendiumCategoryHook()
 	await registerTokenHUDButtons()
 	activateSceneButtonListeners()
+
+	await registerDefaultOracleTrees()
 })
 
 Hooks.once('ready', async () => {
diff --git a/src/module/features/customoracles.ts b/src/module/features/customoracles.ts
index 54876a701..42fdbca94 100644
--- a/src/module/features/customoracles.ts
+++ b/src/module/features/customoracles.ts
@@ -26,12 +26,11 @@ const ISOracleCategories = ((ironsworn as any).default as Ironsworn)[
 	'Oracle Categories'
 ]
 
-const emptyNode = () =>
-	({
-		displayName: '',
-		tables: [],
-		children: []
-	} as IOracleTreeNode)
+const emptyNode: () => IOracleTreeNode = () => ({
+	displayName: '',
+	tables: [],
+	children: []
+})
 
 async function createOracleTree(
 	compendium: string,
@@ -212,3 +211,51 @@ export function findPathToNodeByDfId(rootNode: IOracleTreeNode, dfId: string) {
 	walk(rootNode)
 	return ret
 }
+
+type OracleCategory = 'ironsworn' | 'starforged'
+
+const ORACLES: Record<OracleCategory, IOracleTreeNode> = {
+	ironsworn: emptyNode(),
+	starforged: emptyNode()
+}
+
+export function registerOracleTreeInternal(
+	category: OracleCategory,
+	rootNode: IOracleTreeNode
+) {
+	ORACLES[category] = rootNode
+}
+
+let defaultTreesInitialized = false
+
+export async function registerDefaultOracleTrees() {
+	const ironswornOracles = await createIronswornOracleTree()
+	registerOracleTreeInternal('ironsworn', ironswornOracles)
+
+	const starforgedOracles = await createStarforgedOracleTree()
+	registerOracleTreeInternal('starforged', starforgedOracles)
+
+	defaultTreesInitialized = true
+	console.log({ ORACLES })
+}
+
+// Available in browser
+export function registerOracleTree(
+	category: OracleCategory,
+	rootNode: IOracleTreeNode
+) {
+	// Check if internal registrations have been done
+	// If not, do nothing and send a warning to the UI
+	if (!defaultTreesInitialized) {
+		const message =
+			'Not ready yet. Call registerOracleTree from a "ready" hook please.'
+		ui.notifications?.warn(message)
+		throw new Error(message)
+	}
+
+	registerOracleTreeInternal(category, rootNode)
+}
+
+export function getOracleTree(category: OracleCategory): IOracleTreeNode {
+	return ORACLES[category]
+}

From 26072676be8b386cc7e1899c827e9263cd39df5b Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Sat, 25 Mar 2023 07:20:50 -0700
Subject: [PATCH 05/12] Adjust startup order

---
 src/index.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 519149fdc..f01d7c45d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -222,8 +222,6 @@ Hooks.once('init', async () => {
 	registerCompendiumCategoryHook()
 	await registerTokenHUDButtons()
 	activateSceneButtonListeners()
-
-	await registerDefaultOracleTrees()
 })
 
 Hooks.once('ready', async () => {
@@ -231,11 +229,11 @@ Hooks.once('ready', async () => {
 
 	registerDragAndDropHooks()
 	registerChatAlertHooks()
-	runStartupMacro()
+
+	await registerDefaultOracleTrees()
 
 	await FirstStartDialog.maybeShow()
 	await registerTours()
 
-	// Pre-load all the oracles
-	await primeCommonPackCaches()
+	runStartupMacro()
 })

From 37f49de67a30f0c2d22229960729f65b65f7c7c3 Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Sat, 25 Mar 2023 07:29:11 -0700
Subject: [PATCH 06/12] Use pre-built trees everywhere

---
 src/module/features/customoracles.ts          |  7 ++++---
 src/module/rolls/oracle-roll-message.ts       | 21 +++++++++----------
 .../vue/components/sf-movesheetoracles.vue    | 12 +++--------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/module/features/customoracles.ts b/src/module/features/customoracles.ts
index 42fdbca94..1696c3803 100644
--- a/src/module/features/customoracles.ts
+++ b/src/module/features/customoracles.ts
@@ -50,19 +50,20 @@ async function createOracleTree(
 	await augmentWithFolderContents(rootNode)
 
 	// Fire the hook and allow extensions to modify the tree
-	await Hooks.call('ironswornOracles', rootNode)
+	// TODO: deprecate this, warning if something is registered
+	Hooks.call('ironswornOracles', rootNode)
 
 	return rootNode
 }
 
-export async function createIronswornOracleTree(): Promise<IOracleTreeNode> {
+async function createIronswornOracleTree(): Promise<IOracleTreeNode> {
 	return await createOracleTree(
 		'foundry-ironsworn.ironswornoracles',
 		ISOracleCategories
 	)
 }
 
-export async function createStarforgedOracleTree(): Promise<IOracleTreeNode> {
+async function createStarforgedOracleTree(): Promise<IOracleTreeNode> {
 	return await createOracleTree(
 		'foundry-ironsworn.starforgedoracles',
 		SFOracleCategories
diff --git a/src/module/rolls/oracle-roll-message.ts b/src/module/rolls/oracle-roll-message.ts
index 25eba6adf..5985329de 100644
--- a/src/module/rolls/oracle-roll-message.ts
+++ b/src/module/rolls/oracle-roll-message.ts
@@ -3,10 +3,9 @@ import { compact, pick, sortBy } from 'lodash-es'
 import { marked } from 'marked'
 import { getFoundryTableByDfId } from '../dataforged'
 import {
-	createIronswornOracleTree,
-	createStarforgedOracleTree,
 	findPathToNodeByDfId,
-	findPathToNodeByTableUuid
+	findPathToNodeByTableUuid,
+	getOracleTree
 } from '../features/customoracles'
 
 export interface TableRow {
@@ -68,9 +67,9 @@ export class OracleRollMessage {
 
 	static async fromDfOracleId(dfOracleId: string): Promise<OracleRollMessage> {
 		// Subtitle can be inferred from the structure of the DF ID
-		const oracleTreeRoot = await (dfOracleId.startsWith('Ironsworn/')
-			? createIronswornOracleTree
-			: createStarforgedOracleTree)()
+		const oracleTreeRoot = getOracleTree(
+			dfOracleId.startsWith('Ironsworn/') ? 'ironsworn' : 'starforged'
+		)
 		const pathElements = findPathToNodeByDfId(oracleTreeRoot, dfOracleId)
 		const pathNames = pathElements.map((x) => x.displayName)
 		pathNames.shift() // root node has no display name
@@ -174,15 +173,15 @@ export class OracleRollMessage {
 	private async oraclePath(): Promise<string | undefined> {
 		if (this.tableUuid == null) return undefined
 
-		const [starforgedRoot, ironswornRooot] = await Promise.all([
-			createStarforgedOracleTree(),
-			createIronswornOracleTree()
-		])
+		const starforgedRoot = getOracleTree('starforged')
+		const ironswornRoot = getOracleTree('ironsworn')
+
 		const pathElements =
 			findPathToNodeByTableUuid(starforgedRoot, this.tableUuid) ??
-			findPathToNodeByTableUuid(ironswornRooot, this.tableUuid)
+			findPathToNodeByTableUuid(ironswornRoot, this.tableUuid)
 		pathElements.shift() // no display name for root node
 		pathElements.pop() // last node is the table we rolled
+
 		return pathElements.map((x) => x.displayName).join(' / ')
 	}
 
diff --git a/src/module/vue/components/sf-movesheetoracles.vue b/src/module/vue/components/sf-movesheetoracles.vue
index 5d4f21482..7fd36d711 100644
--- a/src/module/vue/components/sf-movesheetoracles.vue
+++ b/src/module/vue/components/sf-movesheetoracles.vue
@@ -33,23 +33,17 @@
 </template>
 
 <script setup lang="ts">
-import { inject, nextTick, provide, reactive, ref, watch } from 'vue'
+import { nextTick, provide, reactive, ref, watch } from 'vue'
 import { findOracleWithIntermediateNodes } from '../../dataforged'
 import type { IOracleTreeNode } from '../../features/customoracles'
-import {
-	createIronswornOracleTree,
-	createStarforgedOracleTree
-} from '../../features/customoracles'
+import { getOracleTree } from '../../features/customoracles'
 import IronBtn from './buttons/iron-btn.vue'
 import OracleTreeNode from './oracle-tree-node.vue'
 
 const props = defineProps<{ toolset: 'ironsworn' | 'starforged' }>()
 provide('toolset', props.toolset)
 
-const tempTreeRoot =
-	props.toolset === 'ironsworn'
-		? await createIronswornOracleTree()
-		: await createStarforgedOracleTree()
+const tempTreeRoot = getOracleTree(props.toolset)
 
 const treeRoot = reactive<IOracleTreeNode>(tempTreeRoot)
 type ReactiveNode = typeof treeRoot

From a2478f5bb2d8bfa1c111e867ab39581b3d4fcf8e Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Sat, 25 Mar 2023 07:31:26 -0700
Subject: [PATCH 07/12] Quiet

---
 src/module/features/customoracles.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/module/features/customoracles.ts b/src/module/features/customoracles.ts
index 1696c3803..3114a3a12 100644
--- a/src/module/features/customoracles.ts
+++ b/src/module/features/customoracles.ts
@@ -237,7 +237,6 @@ export async function registerDefaultOracleTrees() {
 	registerOracleTreeInternal('starforged', starforgedOracles)
 
 	defaultTreesInitialized = true
-	console.log({ ORACLES })
 }
 
 // Available in browser

From a0ee6e353d37c1cb37d8db4277a9efd88d538cd6 Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Sat, 25 Mar 2023 07:35:57 -0700
Subject: [PATCH 08/12] Clone

---
 src/module/features/customoracles.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/module/features/customoracles.ts b/src/module/features/customoracles.ts
index 3114a3a12..c8d4b9246 100644
--- a/src/module/features/customoracles.ts
+++ b/src/module/features/customoracles.ts
@@ -5,7 +5,7 @@ import type {
 	Ironsworn
 } from 'dataforged'
 import { starforged, ironsworn } from 'dataforged'
-import { compact } from 'lodash-es'
+import { cloneDeep, compact } from 'lodash-es'
 import { getFoundryTableByDfId } from '../dataforged'
 import { cachedDocumentsForPack } from './pack-cache'
 
@@ -257,5 +257,5 @@ export function registerOracleTree(
 }
 
 export function getOracleTree(category: OracleCategory): IOracleTreeNode {
-	return ORACLES[category]
+	return cloneDeep(ORACLES[category])
 }

From 9e50bfaf12d99094e5104338cb64fbc4c5a4252a Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Sat, 25 Mar 2023 07:39:25 -0700
Subject: [PATCH 09/12] Include custom folders

---
 src/module/features/customoracles.ts          | 22 +++++++++++++------
 src/module/rolls/oracle-roll-message.ts       |  8 +++----
 .../vue/components/sf-movesheetoracles.vue    |  4 ++--
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/module/features/customoracles.ts b/src/module/features/customoracles.ts
index c8d4b9246..63fdda3de 100644
--- a/src/module/features/customoracles.ts
+++ b/src/module/features/customoracles.ts
@@ -46,13 +46,6 @@ async function createOracleTree(
 		rootNode.children.push(await walkOracleCategory(category))
 	}
 
-	// Add in custom oracles from a well-known directory
-	await augmentWithFolderContents(rootNode)
-
-	// Fire the hook and allow extensions to modify the tree
-	// TODO: deprecate this, warning if something is registered
-	Hooks.call('ironswornOracles', rootNode)
-
 	return rootNode
 }
 
@@ -259,3 +252,18 @@ export function registerOracleTree(
 export function getOracleTree(category: OracleCategory): IOracleTreeNode {
 	return cloneDeep(ORACLES[category])
 }
+
+export async function getOracleTreeWithCustomOracles(
+	category: OracleCategory
+): Promise<IOracleTreeNode> {
+	const rootNode = getOracleTree(category)
+
+	// Add in custom oracles from a well-known directory
+	await augmentWithFolderContents(rootNode)
+
+	// Fire the hook and allow extensions to modify the tree
+	// TODO: deprecate this, warning if something is registered
+	Hooks.call('ironswornOracles', rootNode)
+
+	return rootNode
+}
diff --git a/src/module/rolls/oracle-roll-message.ts b/src/module/rolls/oracle-roll-message.ts
index 5985329de..97a108fc6 100644
--- a/src/module/rolls/oracle-roll-message.ts
+++ b/src/module/rolls/oracle-roll-message.ts
@@ -5,7 +5,7 @@ import { getFoundryTableByDfId } from '../dataforged'
 import {
 	findPathToNodeByDfId,
 	findPathToNodeByTableUuid,
-	getOracleTree
+	getOracleTreeWithCustomOracles
 } from '../features/customoracles'
 
 export interface TableRow {
@@ -67,7 +67,7 @@ export class OracleRollMessage {
 
 	static async fromDfOracleId(dfOracleId: string): Promise<OracleRollMessage> {
 		// Subtitle can be inferred from the structure of the DF ID
-		const oracleTreeRoot = getOracleTree(
+		const oracleTreeRoot = await getOracleTreeWithCustomOracles(
 			dfOracleId.startsWith('Ironsworn/') ? 'ironsworn' : 'starforged'
 		)
 		const pathElements = findPathToNodeByDfId(oracleTreeRoot, dfOracleId)
@@ -173,8 +173,8 @@ export class OracleRollMessage {
 	private async oraclePath(): Promise<string | undefined> {
 		if (this.tableUuid == null) return undefined
 
-		const starforgedRoot = getOracleTree('starforged')
-		const ironswornRoot = getOracleTree('ironsworn')
+		const starforgedRoot = await getOracleTreeWithCustomOracles('starforged')
+		const ironswornRoot = await getOracleTreeWithCustomOracles('ironsworn')
 
 		const pathElements =
 			findPathToNodeByTableUuid(starforgedRoot, this.tableUuid) ??
diff --git a/src/module/vue/components/sf-movesheetoracles.vue b/src/module/vue/components/sf-movesheetoracles.vue
index 7fd36d711..c1481de42 100644
--- a/src/module/vue/components/sf-movesheetoracles.vue
+++ b/src/module/vue/components/sf-movesheetoracles.vue
@@ -36,14 +36,14 @@
 import { nextTick, provide, reactive, ref, watch } from 'vue'
 import { findOracleWithIntermediateNodes } from '../../dataforged'
 import type { IOracleTreeNode } from '../../features/customoracles'
-import { getOracleTree } from '../../features/customoracles'
+import { getOracleTreeWithCustomOracles } from '../../features/customoracles'
 import IronBtn from './buttons/iron-btn.vue'
 import OracleTreeNode from './oracle-tree-node.vue'
 
 const props = defineProps<{ toolset: 'ironsworn' | 'starforged' }>()
 provide('toolset', props.toolset)
 
-const tempTreeRoot = getOracleTree(props.toolset)
+const tempTreeRoot = await getOracleTreeWithCustomOracles(props.toolset)
 
 const treeRoot = reactive<IOracleTreeNode>(tempTreeRoot)
 type ReactiveNode = typeof treeRoot

From 70eac61198ee8de8fd59860e56065d36fdf6be2a Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Sat, 25 Mar 2023 09:48:16 -0700
Subject: [PATCH 10/12] Remove TODO

---
 src/module/features/customoracles.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/module/features/customoracles.ts b/src/module/features/customoracles.ts
index 63fdda3de..7a2e9dff3 100644
--- a/src/module/features/customoracles.ts
+++ b/src/module/features/customoracles.ts
@@ -262,7 +262,6 @@ export async function getOracleTreeWithCustomOracles(
 	await augmentWithFolderContents(rootNode)
 
 	// Fire the hook and allow extensions to modify the tree
-	// TODO: deprecate this, warning if something is registered
 	Hooks.call('ironswornOracles', rootNode)
 
 	return rootNode

From 2844ae2dba657b86b1712d5f53e297033b69bd0d Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Mon, 27 Mar 2023 06:19:15 -0700
Subject: [PATCH 11/12] Fix expansion behavior of oracle previews

---
 .../vue/components/oracle-tree-node.vue       | 28 ++++++++++++--
 .../components/rules-text/oracle-table.vue    | 37 +++++--------------
 .../rules-text/rules-text-oracle.vue          | 14 ++++++-
 3 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/src/module/vue/components/oracle-tree-node.vue b/src/module/vue/components/oracle-tree-node.vue
index 4d0d24f50..b31f0ec82 100644
--- a/src/module/vue/components/oracle-tree-node.vue
+++ b/src/module/vue/components/oracle-tree-node.vue
@@ -24,7 +24,8 @@
 				<RulesTextOracle
 					v-if="state.descriptionExpanded"
 					:class="$style.content"
-					:oracle-table-uuid="node.tables[0]"
+					:table-rows="state.tableRows"
+					:table-description="state.tableDescription"
 					:source="node.dataforgedNode?.Source"
 					@moveclick="moveclick"
 					@oracleclick="oracleclick" />
@@ -65,7 +66,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive, ref } from 'vue'
+import { computed, nextTick, reactive, ref } from 'vue'
 import type { IOracleTreeNode } from '../../features/customoracles'
 import { FontAwesome } from './icon/icon-common'
 import BtnOracle from './buttons/btn-oracle.vue'
@@ -78,9 +79,19 @@ import IronIcon from './icon/iron-icon.vue'
 
 const props = defineProps<{ node: IOracleTreeNode }>()
 
+// FIXME: use v10 types when available, or hack some together for tables
+type TableRowData = {
+	low: number
+	high: number
+	text: string
+	selected: boolean
+}
+
 const state = reactive({
 	manuallyExpanded: props.node.forceExpanded ?? false,
 	descriptionExpanded: false,
+	tableRows: [] as Array<TableRowData>,
+	tableDescription: '',
 	highlighted: false
 })
 
@@ -90,7 +101,18 @@ const isLeaf = computed(() => {
 	return props.node.tables.length > 0
 })
 
-function toggleDescription() {
+async function toggleDescription() {
+	if (!state.tableDescription) {
+		const table = (await fromUuid(props.node.tables[0])) as RollTable
+		state.tableRows = table.results.map((row: any) => ({
+			low: row.range[0],
+			high: row.range[1],
+			text: row.text,
+			selected: false
+		}))
+		state.tableDescription = (table as any).description ?? ''
+		await nextTick()
+	}
 	state.descriptionExpanded = !state.descriptionExpanded
 }
 function toggleManually() {
diff --git a/src/module/vue/components/rules-text/oracle-table.vue b/src/module/vue/components/rules-text/oracle-table.vue
index 74d6f33ed..d3a08a4b6 100644
--- a/src/module/vue/components/rules-text/oracle-table.vue
+++ b/src/module/vue/components/rules-text/oracle-table.vue
@@ -1,8 +1,8 @@
 <template>
 	<table class="oracle-table">
 		<caption
-			v-if="!noCaption && rollTable?.description"
-			v-html="enrichMarkdown(rollTable?.description ?? '')" />
+			v-if="!noCaption && tableDescription"
+			v-html="enrichMarkdown(tableDescription ?? '')" />
 		<thead>
 			<tr>
 				<th scope="col" class="oracle-table-column-roll-range">
@@ -25,20 +25,8 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
-import { sortBy } from 'lodash-es'
 import { enrichMarkdown } from '../../vue-plugin.js'
 
-// FIXME: use v10 types when available, or hack some together for tables
-const props = defineProps<{
-	oracleTableUuid: string
-	noCaption?: boolean
-}>()
-
-const rollTable = (await fromUuid(props.oracleTableUuid)) as
-	| (RollTable & { description?: string })
-	| undefined
-
 type TableRowData = {
 	low: number
 	high: number
@@ -46,26 +34,19 @@ type TableRowData = {
 	selected: boolean
 }
 
+// FIXME: use v10 types when available, or hack some together for tables
+const props = defineProps<{
+	tableRows: TableRowData[]
+	tableDescription: string
+	noCaption?: boolean
+}>()
+
 function rangeString({ low, high }: TableRowData) {
 	if (low === high) {
 		return low.toString()
 	}
 	return `${low}-${high}`
 }
-const tableRows = computed(() =>
-	sortBy(
-		(rollTable?.results?.contents ?? []).map(
-			(row: any) =>
-				({
-					low: row.range[0],
-					high: row.range[1],
-					text: row.text,
-					selected: false
-				} as TableRowData)
-		),
-		'low'
-	)
-)
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/module/vue/components/rules-text/rules-text-oracle.vue b/src/module/vue/components/rules-text/rules-text-oracle.vue
index 3cfdadb58..5b56fc1c8 100644
--- a/src/module/vue/components/rules-text/rules-text-oracle.vue
+++ b/src/module/vue/components/rules-text/rules-text-oracle.vue
@@ -1,7 +1,9 @@
 <template>
 	<RulesText class="rules-text-oracle" :source="source" type="slot">
 		<template #default>
-			<OracleTable :oracle-table-uuid="oracleTableUuid" />
+			<OracleTable
+				:table-description="tableDescription"
+				:table-rows="tableRows" />
 		</template>
 		<template #before-main>
 			<slot name="before-main"></slot>
@@ -20,8 +22,16 @@ import RulesText from './rules-text.vue'
 import OracleTable from './oracle-table.vue'
 import type { ISource } from 'dataforged'
 
+type TableRowData = {
+	low: number
+	high: number
+	text: string
+	selected: boolean
+}
+
 const props = defineProps<{
-	oracleTableUuid: string
+	tableRows: TableRowData[]
+	tableDescription: string
 	source?: ISource
 }>()
 </script>

From ea86451c89a94de46cd704d43c5057a5a6463ffd Mon Sep 17 00:00:00 2001
From: Ben Straub <ben@straub.cc>
Date: Mon, 27 Mar 2023 06:39:19 -0700
Subject: [PATCH 12/12] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 161e0354d..98a5e2723 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Fixed bug with Starforged asset decoration; it should now switch with the game theme as intended ([#700](https://github.com/ben/foundry-ironsworn/pull/700))
 - Drop the custom font ([#702](https://github.com/ben/foundry-ironsworn/pull/702))
 - Fix a tooltip bug on the edit-sector button
+- Added a new method of customizing oracles, which should work better for larger projects like Ironsmith ([#686](https://github.com/ben/foundry-ironsworn/pull/696))
 
 ## 1.20.30