allow for already resolved files

Author: garethbowen

packages/web-forms/src/lib/locale/useLocale.ts

@@ -1,6 +1,5 @@
 import { createIntl, type IntlShape } from '@formatjs/intl';
 import type { FormLanguage, RootNode } from '@getodk/xforms-engine';
-import { all as primeLocales } from 'primelocale';
 import type { Ref } from 'vue';
 import { computed, onUnmounted, shallowRef, watch } from 'vue';
 // English strings always available as language fallback
@@ -185,9 +184,9 @@ export const useLocale = (formRef: Ref<RootNode | null>) => {
 		const newContentLocale = formBaseLocale ?? FALLBACK;
 		document.documentElement.lang = newContentLocale;
 		latestRequestedLocale.locale = newContentLocale;
-		const primeLocaleKey = findBestLocale(candidates, (lang) => {
-			return Object.hasOwn(primeLocales, lang);
-		});
+		// const primeLocaleKey = findBestLocale(candidates, (lang) => {
+		// 	return Object.hasOwn(primeLocales, lang);
+		// });
 		// const primeLocale = primeLocales[primeLocaleKey as keyof typeof primeLocales];
 		// if (primeLocale) {
 		// 	primevue.config.locale = { ...primevue.config.locale, ...primeLocale };

packages/xforms-engine/src/instance/attachments/InstanceAttachmentsState.ts

@@ -8,7 +8,7 @@ export class InstanceAttachmentsState extends Map<InstanceAttachmentContext, Ins
 		super();
 	}
 
-	getInitialFileValue(instanceNode: StaticLeafElement | null): Promise<File> | null {
+	getInitialFileValue(instanceNode: StaticLeafElement | null): File | Promise<File> | null {
 		if (instanceNode == null) {
 			return null;
 		}

packages/xforms-engine/src/instance/input/InitialInstanceState.ts

@@ -1,4 +1,5 @@
 import { getBlobText } from '@getodk/common/lib/web-compat/blob.ts';
+import { INSTANCE_FILE_NAME } from '../../client/constants.ts';
 import type {
 	EditFormInstanceInput,
 	ResolvableFormInstanceInput,
@@ -74,17 +75,16 @@ export class InitialInstanceState {
 		input: EditFormInstanceInput
 	): Promise<InitialInstanceState> {
 		if (input.inputType === 'FORM_INSTANCE_INPUT_RESOLVED') {
-			throw new Error('not yet implemented');
-			// const { data } = input;
-			// const [instanceData] = data;
-			// const instanceFile = instanceData.get(INSTANCE_FILE_NAME);
-			// const instanceXML = await getBlobText(instanceFile);
-			// const attachments = InstanceAttachmentMap.from(data); // TODO wtaf
-
-			// return new this(model, {
-			// 	instanceXML,
-			// 	attachments,
-			// });
+			const { data } = input;
+			const [instanceData] = data;
+			const instanceFile = instanceData.get(INSTANCE_FILE_NAME);
+			const instanceXML = await getBlobText(instanceFile);
+			const attachments = InstanceAttachmentMap.from(data);
+
+			return new this(model, {
+				instanceXML,
+				attachments,
+			});
 		}
 
 		const instanceXML = await resolveInstanceXML(input);

packages/xforms-engine/src/instance/input/InstanceAttachmentMap.ts

@@ -5,7 +5,7 @@ import { MalformedInstanceDataError } from '../../error/MalformedInstanceDataErr
 import { getResponseContentType } from '../../lib/resource-helpers.ts';
 import type { FetchResourceResponse } from '../resource.ts';
 
-type InstanceAttachmentMapSourceEntry = readonly [key: string, value: Promise<File>];
+type InstanceAttachmentMapSourceEntry = readonly [key: string, value: File | Promise<File>];
 
 interface InstanceAttachmentMapSource {
 	entries(): Iterable<InstanceAttachmentMapSourceEntry>;
@@ -52,44 +52,7 @@ const resolveInstanceAttachmentMapSource = (
 	return { entries: () => entries };
 };
 
-interface KeyedInstanceDataFile<Key extends string> extends File {
-	readonly name: Key;
-}
-
-type AssertKeyedInstanceDataFile = <Key extends string>(
-	key: Key,
-	file: File
-) => asserts file is KeyedInstanceDataFile<Key>;
-
-const assertKeyedInstanceDataFile: AssertKeyedInstanceDataFile = (key, file) => {
-	if (file.name !== key) {
-		throw new MalformedInstanceDataError(
-			`Unexpected InstanceData file. Expected file name to match key, got key: ${JSON.stringify(key)} and file name: ${JSON.stringify(file.name)}`
-		);
-	}
-};
-
-type UnknownInstanceDataEntry = readonly [key: string, value: FormDataEntryValue];
-
-type KeyedInstanceDataEntry<Key extends string> = readonly [key: Key, KeyedInstanceDataFile<Key>];
-
-type AssertInstanceDataEntry = <Key extends string>(
-	entry: UnknownInstanceDataEntry
-) => asserts entry is KeyedInstanceDataEntry<Key>;
-
-const assertInstanceDataEntry: AssertInstanceDataEntry = (entry) => {
-	const [key, value] = entry;
-
-	if (!(value instanceof File)) {
-		throw new MalformedInstanceDataError(
-			`Unexpected non-file attachment in InstanceData for key: ${key}`
-		);
-	}
-
-	assertKeyedInstanceDataFile(key, value);
-};
-
-export class InstanceAttachmentMap extends Map<string, Promise<File>> {
+export class InstanceAttachmentMap extends Map<string, File | Promise<File>> {
 	static from(sources: readonly InstanceAttachmentMapSource[]): InstanceAttachmentMap {
 		return new this(sources);
 	}

packages/xforms-engine/src/lib/reactivity/createInstanceAttachment.ts

@@ -138,7 +138,6 @@ export const createInstanceAttachment = (
 		const { rootDocument, nodeId } = context;
 		const { attachments } = rootDocument;
 
-		// TODO THIS IS IT
 		const filePromise = attachments.getInitialFileValue(context.instanceNode);
 		const initialState = instanceAttachmentState(context, {
 			nodeId,
@@ -149,7 +148,7 @@ export const createInstanceAttachment = (
 		const [getState, setState] = createSignal<InstanceAttachmentState>(initialState);
 
 		if (filePromise) {
-			void filePromise.then((file: File) => {
+			void Promise.resolve(filePromise).then((file: File) => {
 				const resolvedState = instanceAttachmentState(context, {
 					nodeId,
 					file,