@getodk/xforms-engine 0.6.0 → 0.8.0

package/src/parse/model/SecondaryInstance/sources/BlankSecondaryInstanceSource.ts

@@ -1,10 +1,7 @@
-import { XFORMS_NAMESPACE_URI } from '@getodk/common/constants/xmlns.ts';
 import type { JRResourceURL } from '@getodk/common/jr-resources/JRResourceURL.ts';
-import type { StaticNode } from '../../../../integration/xpath/static-dom/StaticNode.ts';
-import { parseStaticDocumentFromDOMSubtree } from '../../../shared/parseStaticDocumentFromDOMSubtree.ts';
 import type { DOMSecondaryInstanceElement } from '../../../XFormDOM.ts';
-import { SecondaryInstanceDefinition } from '../SecondaryInstanceDefinition.ts';
-import { SecondaryInstanceRootDefinition } from '../SecondaryInstanceRootDefinition.ts';
+import { defineSecondaryInstance } from '../defineSecondaryInstance.ts';
+import type { SecondaryInstanceDefinition } from '../SecondaryInstancesDefinition.ts';
 import { SecondaryInstanceSource } from './SecondaryInstanceSource.ts';
 
 export class BlankSecondaryInstanceSource extends SecondaryInstanceSource<'blank'> {
@@ -16,25 +13,7 @@ export class BlankSecondaryInstanceSource extends SecondaryInstanceSource<'blank
 		super('blank', instanceId, resourceURL, domElement);
 	}
 
-	/**
-	 * @todo there is really no sense in using the DOM for this, other than it was
-	 * quicker/more ergonomic than constructing the requisite {@link StaticNode}
-	 * structures directly. Pretty good sign those constructor signatures could
-	 * use some TLC!
-	 */
 	parseDefinition(): SecondaryInstanceDefinition {
-		const xmlDocument = this.domElement.ownerDocument.implementation.createDocument(
-			XFORMS_NAMESPACE_URI,
-			'instance'
-		);
-		const instanceElement = xmlDocument.documentElement;
-
-		instanceElement.setAttribute('id', this.instanceId);
-
-		return parseStaticDocumentFromDOMSubtree(
-			SecondaryInstanceDefinition,
-			SecondaryInstanceRootDefinition,
-			instanceElement
-		);
+		return defineSecondaryInstance(this.instanceId, '');
 	}
 }

package/src/parse/model/SecondaryInstance/sources/CSVExternalSecondaryInstance.ts

@@ -1,12 +1,9 @@
-import { XFORMS_NAMESPACE_URI } from '@getodk/common/constants/xmlns.ts';
 import type { JRResourceURL } from '@getodk/common/jr-resources/JRResourceURL.ts';
 import * as papa from 'papaparse';
 import { ErrorProductionDesignPendingError } from '../../../../error/ErrorProductionDesignPendingError.ts';
-import { StaticAttribute } from '../../../../integration/xpath/static-dom/StaticAttribute.ts';
-import { StaticElement } from '../../../../integration/xpath/static-dom/StaticElement.ts';
-import { StaticText } from '../../../../integration/xpath/static-dom/StaticText.ts';
-import { SecondaryInstanceDefinition } from '../SecondaryInstanceDefinition.ts';
-import { SecondaryInstanceRootDefinition } from '../SecondaryInstanceRootDefinition.ts';
+import type { StaticElementOptions } from '../../../../integration/xpath/static-dom/StaticElement.ts';
+import { defineSecondaryInstance } from '../defineSecondaryInstance.ts';
+import type { SecondaryInstanceDefinition } from '../SecondaryInstancesDefinition.ts';
 import { ExternalSecondaryInstanceSource } from './ExternalSecondaryInstanceSource.ts';
 
 type CSVColumn = string;
@@ -88,89 +85,39 @@ interface CSVExternalSecondaryInstanceItemColumn {
 
 type CSVExternalSecondaryInstanceItem = readonly CSVExternalSecondaryInstanceItemColumn[];
 
-class CSVExternalSecondaryInstanceColumnElement extends StaticElement {
-	constructor(parent: StaticElement, column: CSVExternalSecondaryInstanceItemColumn) {
-		const { columnName, cellValue } = column;
-
-		super(
-			parent,
-			() => [],
-			(self) => [new StaticText(self, cellValue)],
-			{
-				namespaceURI: XFORMS_NAMESPACE_URI,
-				localName: columnName,
-			}
-		);
-	}
-}
+const columnChildOption = (
+	column: CSVExternalSecondaryInstanceItemColumn
+): StaticElementOptions => {
+	const { columnName, cellValue } = column;
 
-class CSVExternalSecondaryInstanceItemElement extends StaticElement {
-	constructor(parent: StaticElement, item: CSVExternalSecondaryInstanceItem) {
-		super(
-			parent,
-			() => [],
-			(self) => {
-				return item.map((column) => {
-					return new CSVExternalSecondaryInstanceColumnElement(self, column);
-				});
-			},
-			{
-				namespaceURI: XFORMS_NAMESPACE_URI,
-				localName: 'item',
-			}
-		);
-	}
-}
+	return {
+		name: columnName,
+		children: [cellValue],
+	};
+};
 
-class CSVExternalSecondaryInstanceRootElement extends StaticElement {
-	constructor(parent: StaticElement, items: readonly CSVExternalSecondaryInstanceItem[]) {
-		super(
-			parent,
-			() => [],
-			(self) => {
-				return items.map((item) => {
-					return new CSVExternalSecondaryInstanceItemElement(self, item);
-				});
-			},
-			{
-				namespaceURI: XFORMS_NAMESPACE_URI,
-				localName: 'root',
-			}
-		);
-	}
-}
+const itemChildOption = (item: CSVExternalSecondaryInstanceItem): StaticElementOptions => {
+	return {
+		name: 'item',
+		children: item.map(columnChildOption),
+	};
+};
 
-class CSVExternalSecondaryInstanceDocumentElement extends SecondaryInstanceRootDefinition {
-	constructor(
-		instanceId: string,
-		parent: CSVExternalSecondaryInstanceDefinition,
-		items: readonly CSVExternalSecondaryInstanceItem[]
-	) {
-		super(
-			parent,
-			(self) => [
-				new StaticAttribute(self, {
-					namespaceURI: XFORMS_NAMESPACE_URI,
-					localName: 'id',
-					value: instanceId,
-				}),
-			],
-			(self) => [new CSVExternalSecondaryInstanceRootElement(self, items)],
-			{
-				namespaceURI: XFORMS_NAMESPACE_URI,
-				localName: 'instance',
-			}
-		);
-	}
-}
+const rootChildOption = (
+	items: readonly CSVExternalSecondaryInstanceItem[]
+): StaticElementOptions => {
+	return {
+		name: 'root',
+		children: items.map(itemChildOption),
+	};
+};
 
-class CSVExternalSecondaryInstanceDefinition extends SecondaryInstanceDefinition {
-	constructor(instanceId: string, items: readonly CSVExternalSecondaryInstanceItem[]) {
-		super((self) => {
-			return new CSVExternalSecondaryInstanceDocumentElement(instanceId, self, items);
-		});
-	}
-}
+const csvExternalSecondaryInstanceDefinition = (
+	instanceId: string,
+	items: readonly CSVExternalSecondaryInstanceItem[]
+): SecondaryInstanceDefinition => {
+	return defineSecondaryInstance(instanceId, rootChildOption(items));
+};
 
 export class CSVExternalSecondaryInstanceSource extends ExternalSecondaryInstanceSource<'csv'> {
 	/**
@@ -283,6 +230,6 @@ export class CSVExternalSecondaryInstanceSource extends ExternalSecondaryInstanc
 		});
 		const items = this.toItems(columns, rows);
 
-		return new CSVExternalSecondaryInstanceDefinition(this.instanceId, items);
+		return csvExternalSecondaryInstanceDefinition(this.instanceId, items);
 	}
 }

package/src/parse/model/SecondaryInstance/sources/ExternalSecondaryInstanceResource.ts

@@ -2,6 +2,7 @@ import type { JRResourceURL } from '@getodk/common/jr-resources/JRResourceURL.ts
 import type { MissingResourceBehavior } from '../../../../client/constants.ts';
 import type { FetchResource, FetchResourceResponse } from '../../../../client/resources.ts';
 import { ErrorProductionDesignPendingError } from '../../../../error/ErrorProductionDesignPendingError.ts';
+import { getResponseContentType } from '../../../../lib/resource-helpers.ts';
 import { FormAttachmentResource } from '../../../attachments/FormAttachmentResource.ts';
 import type { ExternalSecondaryInstanceSourceFormat } from './SecondaryInstanceSource.ts';
 
@@ -13,36 +14,6 @@ const assertResponseSuccess = (resourceURL: JRResourceURL, response: FetchResour
 	}
 };
 
-const stripContentTypeCharset = (contentType: string): string => {
-	return contentType.replace(/;charset=.*$/, '');
-};
-
-const getResponseContentType = (response: FetchResourceResponse): string | null => {
-	const { headers } = response;
-
-	if (headers == null) {
-		return null;
-	}
-
-	const contentType = headers.get('content-type');
-
-	if (contentType != null) {
-		return stripContentTypeCharset(contentType);
-	}
-
-	if (headers instanceof Headers) {
-		return contentType;
-	}
-
-	for (const [header, value] of headers) {
-		if (header.toLowerCase() === 'content-type') {
-			return stripContentTypeCharset(value);
-		}
-	}
-
-	return null;
-};
-
 interface ExternalSecondaryInstanceResourceMetadata<
 	Format extends ExternalSecondaryInstanceSourceFormat = ExternalSecondaryInstanceSourceFormat,
 > {

package/src/parse/model/SecondaryInstance/sources/GeoJSONExternalSecondaryInstance.ts

@@ -1,4 +1,3 @@
-import { XFORMS_NAMESPACE_URI } from '@getodk/common/constants/xmlns.ts';
 import { UnreachableError } from '@getodk/common/lib/error/UnreachableError.ts';
 import { assertUnknownArray } from '@getodk/common/lib/type-assertions/assertUnknownArray.ts';
 import type { UnknownObject } from '@getodk/common/lib/type-assertions/assertUnknownObject.ts';
@@ -12,11 +11,9 @@ import type {
 	FeatureCollection as GeoJSONFeatureCollection,
 } from 'geojson';
 import { ErrorProductionDesignPendingError } from '../../../../error/ErrorProductionDesignPendingError.ts';
-import { StaticAttribute } from '../../../../integration/xpath/static-dom/StaticAttribute.ts';
-import { StaticElement } from '../../../../integration/xpath/static-dom/StaticElement.ts';
-import { StaticText } from '../../../../integration/xpath/static-dom/StaticText.ts';
-import { SecondaryInstanceDefinition } from '../SecondaryInstanceDefinition.ts';
-import { SecondaryInstanceRootDefinition } from '../SecondaryInstanceRootDefinition.ts';
+import type { StaticElementOptions } from '../../../../integration/xpath/static-dom/StaticElement.ts';
+import { defineSecondaryInstance } from '../defineSecondaryInstance.ts';
+import type { SecondaryInstanceDefinition } from '../SecondaryInstancesDefinition.ts';
 import { ExternalSecondaryInstanceSource } from './ExternalSecondaryInstanceSource.ts';
 
 const FEATURE_COLLECTION = 'FeatureCollection';
@@ -252,156 +249,86 @@ const serializeCoordinates = (coordinates: LongLatCoordinates): SerializedCoordi
 	return `${latitude} ${longitude} 0 0`;
 };
 
-class GeoJSONSecondaryInstanceFeatureGeometryElement extends StaticElement {
-	static from(
-		parent: StaticElement,
-		feature: Feature
-	): GeoJSONSecondaryInstanceFeatureGeometryElement {
-		const { geometry } = feature;
+const geometryValues = (geometry: SupportedGeometry): readonly string[] => {
+	switch (geometry.type) {
+		case 'LineString':
+			return geometry.coordinates.map(serializeCoordinates);
 
-		switch (geometry.type) {
-			case 'LineString':
-				return new this(parent, geometry.coordinates);
+		case 'Point':
+			return [serializeCoordinates(geometry.coordinates)];
 
-			case 'Point':
-				return new this(parent, [geometry.coordinates]);
+		case 'Polygon': {
+			const [coordinates = []] = geometry.coordinates;
 
-			case 'Polygon':
-				return new this(parent, geometry.coordinates[0] ?? []);
-
-			default:
-				throw new UnreachableError(geometry);
+			return coordinates.map(serializeCoordinates);
 		}
-	}
 
-	constructor(parent: StaticElement, points: readonly LongLatCoordinates[]) {
-		const values = points.map(serializeCoordinates);
-		const value = values.join('; ');
-
-		super(
-			parent,
-			() => [],
-			(self) => [new StaticText(self, value)],
-			{
-				namespaceURI: XFORMS_NAMESPACE_URI,
-				localName: 'geometry',
-			}
-		);
+		default:
+			throw new UnreachableError(geometry);
 	}
-}
+};
 
-class GeoJSONSecondaryInstanceFeaturePropertyElement extends StaticElement {
-	static *buildPropertyElements(
-		parent: StaticElement,
-		feature: Feature
-	): Iterable<GeoJSONSecondaryInstanceFeaturePropertyElement> {
-		const { properties } = feature;
+const geometryChildElementOption = (feature: Feature): StaticElementOptions => {
+	const { geometry } = feature;
+	const values = geometryValues(geometry);
+	const value = values.join('; ');
 
-		if (properties == null) {
-			return [];
-		}
+	return {
+		name: 'geometry',
+		children: [value],
+	};
+};
 
-		const { id: propertiesId, ...nonIdProperties } = properties;
-		const { id = propertiesId } = feature;
+const propertyChildOption = (propertyName: string, propertyValue: string): StaticElementOptions => {
+	return {
+		name: propertyName,
+		children: [propertyValue],
+	};
+};
 
-		if (id !== undefined) {
-			// eslint-disable-next-line @typescript-eslint/no-base-to-string -- Intentional fallback, we don't know what this is and it could be any permutation of JSON
-			yield new this(parent, 'id', String(id));
-		}
+function* propertyChildOptions(feature: Feature): Iterable<StaticElementOptions> {
+	const { properties } = feature;
 
-		for (const [propertyName, propertyValue] of Object.entries(nonIdProperties)) {
-			yield new this(parent, propertyName, String(propertyValue));
-		}
+	if (properties == null) {
+		return [];
 	}
 
-	constructor(parent: StaticElement, propertyName: string, propertyValue: string) {
-		super(
-			parent,
-			() => [],
-			(self) => [new StaticText(self, propertyValue)],
-			{
-				namespaceURI: XFORMS_NAMESPACE_URI,
-				localName: propertyName,
-			}
-		);
-	}
-}
+	const { id: propertiesId, ...nonIdProperties } = properties;
+	const { id = propertiesId } = feature;
 
-class GeoJSONSecondaryInstanceFeatureItemElement extends StaticElement {
-	constructor(parent: StaticElement, feature: Feature) {
-		super(
-			parent,
-			() => [],
-			(self) => {
-				const geometry = GeoJSONSecondaryInstanceFeatureGeometryElement.from(self, feature);
-				const properties = GeoJSONSecondaryInstanceFeaturePropertyElement.buildPropertyElements(
-					self,
-					feature
-				);
-
-				return [geometry, ...properties];
-			},
-			{
-				namespaceURI: XFORMS_NAMESPACE_URI,
-				localName: 'item',
-			}
-		);
+	if (id !== undefined) {
+		// eslint-disable-next-line @typescript-eslint/no-base-to-string -- Intentional fallback, we don't know what this is and it could be any permutation of JSON
+		yield propertyChildOption('id', String(id));
 	}
-}
 
-class GeoJSONSecondaryInstanceRootElement extends StaticElement {
-	constructor(parent: StaticElement, featureCollection: FeatureCollection) {
-		super(
-			parent,
-			() => [],
-			(self) => {
-				return featureCollection.features.map((feature) => {
-					return new GeoJSONSecondaryInstanceFeatureItemElement(self, feature);
-				});
-			},
-			{
-				namespaceURI: XFORMS_NAMESPACE_URI,
-				localName: 'root',
-			}
-		);
+	for (const [propertyName, propertyValue] of Object.entries(nonIdProperties)) {
+		yield propertyChildOption(propertyName, String(propertyValue));
 	}
 }
 
-class GeoJSONExternalSecondaryInstanceDocumentElement extends SecondaryInstanceRootDefinition {
-	constructor(
-		instanceId: string,
-		parent: GeoJSONExternalSecondaryInstanceDefinition,
-		featureCollection: FeatureCollection
-	) {
-		super(
-			parent,
-			(self) => [
-				new StaticAttribute(self, {
-					namespaceURI: XFORMS_NAMESPACE_URI,
-					localName: 'id',
-					value: instanceId,
-				}),
-			],
-			(self) => [new GeoJSONSecondaryInstanceRootElement(self, featureCollection)],
-			{
-				namespaceURI: XFORMS_NAMESPACE_URI,
-				localName: 'instance',
-			}
-		);
-	}
-}
+const itemChildOption = (feature: Feature): StaticElementOptions => {
+	const geometry = geometryChildElementOption(feature);
+	const properties = propertyChildOptions(feature);
 
-class GeoJSONExternalSecondaryInstanceDefinition extends SecondaryInstanceDefinition {
-	constructor(instanceId: string, featureCollection: FeatureCollection) {
-		super((self) => {
-			return new GeoJSONExternalSecondaryInstanceDocumentElement(
-				instanceId,
-				self,
-				featureCollection
-			);
-		});
-	}
-}
+	return {
+		name: 'item',
+		children: [geometry, ...properties],
+	};
+};
+
+const rootChildOption = (featureCollection: FeatureCollection): StaticElementOptions => {
+	return {
+		name: 'root',
+		children: featureCollection.features.map(itemChildOption),
+	};
+};
+
+const geoJSONExternalSecondaryInstanceDefinition = (
+	instanceId: string,
+	featureCollection: FeatureCollection
+): SecondaryInstanceDefinition => {
+	return defineSecondaryInstance(instanceId, rootChildOption(featureCollection));
+};
 
 export class GeoJSONExternalSecondaryInstanceSource extends ExternalSecondaryInstanceSource<'geojson'> {
 	parseDefinition(): SecondaryInstanceDefinition {
@@ -410,6 +337,6 @@ export class GeoJSONExternalSecondaryInstanceSource extends ExternalSecondaryIns
 
 		assertFeatureCollection(value);
 
-		return new GeoJSONExternalSecondaryInstanceDefinition(this.instanceId, value);
+		return geoJSONExternalSecondaryInstanceDefinition(this.instanceId, value);
 	}
 }

package/src/parse/model/SecondaryInstance/sources/InternalSecondaryInstanceSource.ts

@@ -1,7 +1,7 @@
 import { parseStaticDocumentFromDOMSubtree } from '../../../shared/parseStaticDocumentFromDOMSubtree.ts';
 import type { DOMSecondaryInstanceElement } from '../../../XFormDOM.ts';
-import { SecondaryInstanceDefinition } from '../SecondaryInstanceDefinition.ts';
-import { SecondaryInstanceRootDefinition } from '../SecondaryInstanceRootDefinition.ts';
+import { assertSecondaryInstanceDefinition } from '../assertSecondaryInstanceDefinition.ts';
+import type { SecondaryInstanceDefinition } from '../SecondaryInstancesDefinition.ts';
 import { SecondaryInstanceSource } from './SecondaryInstanceSource.ts';
 
 export class InternalSecondaryInstanceSource extends SecondaryInstanceSource<'internal'> {
@@ -10,10 +10,12 @@ export class InternalSecondaryInstanceSource extends SecondaryInstanceSource<'in
 	}
 
 	parseDefinition(): SecondaryInstanceDefinition {
-		return parseStaticDocumentFromDOMSubtree(
-			SecondaryInstanceDefinition,
-			SecondaryInstanceRootDefinition,
-			this.domElement
-		);
+		const doc = parseStaticDocumentFromDOMSubtree(this.domElement, {
+			nodesetPrefix: `instance('${this.instanceId}')`,
+		});
+
+		assertSecondaryInstanceDefinition(doc);
+
+		return doc;
 	}
 }

package/src/parse/model/SecondaryInstance/sources/SecondaryInstanceSource.ts

@@ -1,6 +1,6 @@
 import type { JRResourceURL } from '@getodk/common/jr-resources/JRResourceURL.ts';
 import type { DOMSecondaryInstanceElement } from '../../../XFormDOM.ts';
-import type { SecondaryInstanceDefinition } from '../SecondaryInstanceDefinition.ts';
+import type { SecondaryInstanceDefinition } from '../SecondaryInstancesDefinition.ts';
 
 // prettier-ignore
 export type ExternalSecondaryInstanceSourceFormat =

package/src/parse/model/SecondaryInstance/sources/XMLExternalSecondaryInstanceSource.ts

@@ -1,7 +1,7 @@
 import { XFORMS_NAMESPACE_URI } from '@getodk/common/constants/xmlns.ts';
 import { parseStaticDocumentFromDOMSubtree } from '../../../shared/parseStaticDocumentFromDOMSubtree.ts';
-import { SecondaryInstanceDefinition } from '../SecondaryInstanceDefinition.ts';
-import { SecondaryInstanceRootDefinition } from '../SecondaryInstanceRootDefinition.ts';
+import { assertSecondaryInstanceDefinition } from '../assertSecondaryInstanceDefinition.ts';
+import type { SecondaryInstanceDefinition } from '../SecondaryInstancesDefinition.ts';
 import { ExternalSecondaryInstanceSource } from './ExternalSecondaryInstanceSource.ts';
 import type { InternalSecondaryInstanceSource } from './InternalSecondaryInstanceSource.ts';
 
@@ -23,10 +23,10 @@ export class XMLExternalSecondaryInstanceSource extends ExternalSecondaryInstanc
 		instanceElement.setAttribute('id', this.instanceId);
 		instanceElement.innerHTML = this.resource.data;
 
-		return parseStaticDocumentFromDOMSubtree(
-			SecondaryInstanceDefinition,
-			SecondaryInstanceRootDefinition,
-			instanceElement
-		);
+		const doc = parseStaticDocumentFromDOMSubtree(instanceElement);
+
+		assertSecondaryInstanceDefinition(doc);
+
+		return doc;
 	}
 }

package/src/parse/model/{FormSubmissionDefinition.ts → SubmissionDefinition.ts}

@@ -1,8 +1,8 @@
-import type { SubmissionDefinition } from '../../client/submission/SubmissionDefinition.ts';
+import type { SubmissionMeta } from '../../client/submission/SubmissionMeta.ts';
 import { getSubmissionElement } from '../../lib/dom/query.ts';
 import type { XFormDOM } from '../XFormDOM.ts';
 
-export class FormSubmissionDefinition implements SubmissionDefinition {
+export class SubmissionDefinition implements SubmissionMeta {
 	readonly submissionAction!: URL | null;
 	readonly submissionMethod = 'post';
 	readonly encryptionKey!: string | null;

package/src/parse/model/SubtreeDefinition.ts

@@ -1,3 +1,4 @@
+import type { StaticElement } from '../../integration/xpath/static-dom/StaticElement.ts';
 import { NamespaceDeclarationMap } from '../../lib/names/NamespaceDeclarationMap.ts';
 import { QualifiedName } from '../../lib/names/QualifiedName.ts';
 import type {
@@ -17,14 +18,12 @@ export class SubtreeDefinition extends DescendentNodeDefinition<
 	readonly namespaceDeclarations: NamespaceDeclarationMap;
 	readonly qualifiedName: QualifiedName;
 	readonly children: readonly ChildNodeDefinition[];
-	readonly instances = null;
-	readonly defaultValue = null;
 
 	constructor(
 		parent: ParentNodeDefinition,
 		bind: BindDefinition,
 		bodyElement: AnyBodyElementDefinition | null,
-		readonly node: Element
+		readonly template: StaticElement
 	) {
 		if (
 			bodyElement != null &&
@@ -37,9 +36,9 @@ export class SubtreeDefinition extends DescendentNodeDefinition<
 
 		const { root } = parent;
 
-		this.qualifiedName = new QualifiedName(node);
+		this.qualifiedName = template.qualifiedName;
 		this.namespaceDeclarations = new NamespaceDeclarationMap(this);
-		this.children = root.buildSubtree(this);
+		this.children = root.buildSubtree(this, template);
 	}
 
 	toJSON() {

package/src/parse/model/nodeDefinitionMap.ts

@@ -0,0 +1,34 @@
+import { ErrorProductionDesignPendingError } from '../../error/ErrorProductionDesignPendingError.ts';
+import type { AnyNodeDefinition } from './NodeDefinition.ts';
+import type { RootDefinition } from './RootDefinition.ts';
+
+export type NodesetReference = string;
+
+const collectDefinitions = (
+	result: Map<NodesetReference, AnyNodeDefinition>,
+	definition: AnyNodeDefinition
+): Map<NodesetReference, AnyNodeDefinition> => {
+	const { nodeset } = definition;
+
+	if (result.has(nodeset)) {
+		throw new ErrorProductionDesignPendingError();
+	}
+
+	result.set(nodeset, definition);
+
+	if (definition.type === 'leaf-node') {
+		return result;
+	}
+
+	for (const child of definition.children) {
+		collectDefinitions(result, child);
+	}
+
+	return result;
+};
+
+export type NodeDefinitionMap = ReadonlyMap<NodesetReference, AnyNodeDefinition>;
+
+export const nodeDefinitionMap = (root: RootDefinition): NodeDefinitionMap => {
+	return collectDefinitions(new Map(), root);
+};