From 696707b9f98a805a4f588e3e4940e36dc8624067 Mon Sep 17 00:00:00 2001
From: Haxxer <adamoresten@gmail.com>
Date: Mon, 1 Jul 2024 16:42:21 +0100
Subject: [PATCH] Fixes to const

---
 changelog.md                                  |  2 +
 src/API/private-api.js                        |  2 +-
 .../components/PropertyPathInput.svelte       | 16 +++-----
 .../settings-app/settings-shell.svelte        |  9 +++--
 .../trading-app/TradeEntry.svelte             |  2 +-
 src/helpers/utilities.js                      | 38 ++++++++++---------
 6 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/changelog.md b/changelog.md
index c863bdd0..449b99bf 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,8 @@
 
 - Fixed opening item pile interfaces would spawn duplicate windows instead of focusing existing interfaces
 - Fixed item piles chat messages not working in v11
+- Fixed errors when trying to get document templates in v12 (fixes merchant columns & item pile system settings)
+- Fixed deprecation warnings surrounding `CONST.DOCUMENT_PERMISSION_LEVELS`
 
 ## Version 3.0.1
 
diff --git a/src/API/private-api.js b/src/API/private-api.js
index 9917ef1d..01fad17d 100644
--- a/src/API/private-api.js
+++ b/src/API/private-api.js
@@ -1810,7 +1810,7 @@ export default class PrivateAPI {
 
 		const actorOwners = Object.entries(targetActor.ownership)
 			.filter(entry => {
-				return entry[0] !== "default" && entry[1] === CONST.DOCUMENT_PERMISSION_LEVELS.OWNER;
+				return entry[0] !== "default" && entry[1] === CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER;
 			})
 			.map(entry => game.users.get(entry[0]))
 			.sort(user => user.isGM ? 1 : -1);
diff --git a/src/applications/components/PropertyPathInput.svelte b/src/applications/components/PropertyPathInput.svelte
index 88e60daf..f15469e9 100644
--- a/src/applications/components/PropertyPathInput.svelte
+++ b/src/applications/components/PropertyPathInput.svelte
@@ -1,26 +1,20 @@
 <script>
 
+	import { getDocumentTemplates } from "../../helpers/utilities.js";
+
 	export let value = "";
 	export let templateType;
 	export let required = false;
 
 	const id = "property-list-" + foundry.utils.randomID();
 
-	const templates = Object.values(CONFIG?.[templateType]?.dataModels ?? []).length
-		? {
-			...Object.fromEntries(Object.entries(CONFIG?.[templateType]?.dataModels).map(model => {
-				return [model[0], model[1].schema.initial()]
-			})),
-			types: Object.keys(CONFIG?.[templateType]?.dataModels),
-		}
-		: foundry.utils.deepClone(game.system.documentTypes[templateType]);
+	const templates = getDocumentTemplates(templateType);
 
 	const templateObject = {
 		name: "",
 		type: "",
-		system: templates.types
-			.map(type => {
-				let obj = templates[type];
+		system: Object.values(templates)
+			.map(obj => {
 				if (obj['templates']) {
 					for (const template of obj['templates']) {
 						obj = foundry.utils.mergeObject(obj, templates["templates"][template]);
diff --git a/src/applications/settings-app/settings-shell.svelte b/src/applications/settings-app/settings-shell.svelte
index 4ec2151a..4456fe8b 100644
--- a/src/applications/settings-app/settings-shell.svelte
+++ b/src/applications/settings-app/settings-shell.svelte
@@ -13,6 +13,7 @@
 	import Tabs from "../components/Tabs.svelte";
 	import { TJSDialog } from "#runtime/svelte/application";
 	import CustomDialog from "../components/CustomDialog.svelte";
+	import { getDocumentTemplates } from "../../helpers/utilities.js";
 
 	const { application } = getContext('#external');
 
@@ -192,13 +193,13 @@
             getSettings();
           }}/>
 					<Setting key={SETTINGS.ACTOR_CLASS_TYPE} bind:data="{settings[SETTINGS.ACTOR_CLASS_TYPE]}"
-					         options={["None", ...Object.keys(game.system.documentTypes.Actor)]}/>
+					         options={["None", ...Object.keys(getDocumentTemplates("Actor"))]}/>
 					<Setting key={SETTINGS.ITEM_CLASS_LOOT_TYPE} bind:data="{settings[SETTINGS.ITEM_CLASS_LOOT_TYPE]}"
-					         options={["None", ...Object.keys(game.system.documentTypes.Item)]}/>
+					         options={["None", ...Object.keys(getDocumentTemplates("Item"))]}/>
 					<Setting key={SETTINGS.ITEM_CLASS_WEAPON_TYPE} bind:data="{settings[SETTINGS.ITEM_CLASS_WEAPON_TYPE]}"
-					         options={["None", ...Object.keys(game.system.documentTypes.Item)]}/>
+					         options={["None", ...Object.keys(getDocumentTemplates("Item"))]}/>
 					<Setting key={SETTINGS.ITEM_CLASS_EQUIPMENT_TYPE} bind:data="{settings[SETTINGS.ITEM_CLASS_EQUIPMENT_TYPE]}"
-					         options={["None", ...Object.keys(game.system.documentTypes.Item)]}/>
+					         options={["None", ...Object.keys(getDocumentTemplates("Item"))]}/>
 					<Setting key={SETTINGS.ITEM_QUANTITY_ATTRIBUTE} bind:data="{settings[SETTINGS.ITEM_QUANTITY_ATTRIBUTE]}"/>
 					<Setting key={SETTINGS.ITEM_PRICE_ATTRIBUTE} bind:data="{settings[SETTINGS.ITEM_PRICE_ATTRIBUTE]}"/>
 					<SettingButton key={SETTINGS.CURRENCIES} bind:data="{settings[SETTINGS.CURRENCIES]}"/>
diff --git a/src/applications/trading-app/TradeEntry.svelte b/src/applications/trading-app/TradeEntry.svelte
index 2ade47c8..ee04d4a5 100644
--- a/src/applications/trading-app/TradeEntry.svelte
+++ b/src/applications/trading-app/TradeEntry.svelte
@@ -13,7 +13,7 @@
 		if (!canPreview || !data.id) return;
 		const item = store.leftTraderActor.items.get(data.id) ?? store.rightTraderActor.items.get(data.id);
 		if (!item) return;
-		if (game.user.isGM || item.ownership[game.user.id] === CONST.DOCUMENT_PERMISSION_LEVELS.OWNER) {
+		if (game.user.isGM || item.ownership[game.user.id] === CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER) {
 			return item.sheet.render(true);
 		}
 		const cls = item._getSheetClass()
diff --git a/src/helpers/utilities.js b/src/helpers/utilities.js
index 3f6a02a3..83e84d6b 100644
--- a/src/helpers/utilities.js
+++ b/src/helpers/utilities.js
@@ -133,6 +133,16 @@ export function refreshItemTypesThatCanStack() {
 	getItemTypesThatCanStack();
 }
 
+
+export function getDocumentTemplates(templateType) {
+	return foundry.utils.mergeObject(
+		game.model[templateType],
+		Object.fromEntries(Object.entries(CONFIG[templateType]?.dataModels ?? {}).map(([k, v]) => [k, v.schema.getInitialValue()])),
+		{ inplace: false },
+	);
+}
+
+
 /**
  * Retrieve all system item types that can be stacked
  * @returns {Set<string>}                       The items type that can be stacked on this system
@@ -153,22 +163,16 @@ export function getItemTypesThatCanStack() {
 		}
 
 		const unstackableItemTypes = Helpers.getSetting(SETTINGS.UNSTACKABLE_ITEM_TYPES);
-		const types = new Set(Object.keys(CONFIG?.Item?.dataModels ?? {}).concat(game.system.documentTypes.Item.types));
+		const templates = getDocumentTemplates("Item");
+		const types = new Set(Object.keys(templates));
 		itemTypesWithQuantities = new Set([...itemTypesWithQuantities, ...types.filter(type => {
-			let itemTemplate = {};
-			if (CONFIG?.Item?.dataModels?.[type]?.defineSchema !== undefined) {
-				itemTemplate.system = Object.entries(CONFIG.Item.dataModels[type].defineSchema())
-					.map(([key, schema]) => {
-						return [key, schema.fields ?? true]
-					})
-				itemTemplate.system = Object.fromEntries(itemTemplate.system);
-			} else if (game.system?.templates?.Item?.[type]) {
-				itemTemplate.system = foundry.utils.deepClone(game.system.templates.Item[type]);
-				if (itemTemplate.system?.templates?.length) {
-					const templates = foundry.utils.duplicate(itemTemplate.system.templates);
-					for (let template of templates) {
-						itemTemplate.system = foundry.utils.mergeObject(itemTemplate.system, foundry.utils.duplicate(game.system.documentTypes.Item.templates[template]));
-					}
+			let itemTemplate = {
+				system: foundry.utils.deepClone(templates[type])
+			};
+			if (itemTemplate.system?.templates?.length) {
+				const templates = foundry.utils.duplicate(itemTemplate.system.templates);
+				for (let template of templates) {
+					itemTemplate.system = foundry.utils.mergeObject(itemTemplate.system, foundry.utils.duplicate(game.system.documentTypes.Item.templates[template]));
 				}
 			}
 			return hasItemQuantity(itemTemplate);
@@ -354,7 +358,7 @@ export async function runMacro(macroId, macroData) {
 			throw Helpers.custom_error(`The "${packArray[3]}" macro was not found in Compendium ${packArray[1]}.${packArray[2]}`);
 		}
 		macro = new Macro(findMacro?.toObject());
-		macro.ownership.default = CONST.DOCUMENT_PERMISSION_LEVELS.OWNER;
+		macro.ownership.default = CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER;
 	} else {
 		macro = game.macros.getName(macroId);
 		if (!macro) {
@@ -376,7 +380,7 @@ export async function runMacro(macroId, macroData) {
 export function getOwnedCharacters(user = false) {
 	user = user || game.user;
 	return game.actors.filter(actor => {
-			return actor.ownership?.[user.id] === CONST.DOCUMENT_PERMISSION_LEVELS.OWNER && actor.prototypeToken.actorLink;
+			return actor.ownership?.[user.id] === CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER && actor.prototypeToken.actorLink;
 		})
 		.sort((a, b) => {
 			return b._stats.modifiedTime - a._stats.modifiedTime;