@getodk/xforms-engine 0.1.1 → 0.2.0

package/dist/model/NodeDefinition.d.ts

@@ -1,8 +1,8 @@
 import { AnyBodyElementDefinition } from '../body/BodyDefinition.ts';
-import { RepeatDefinition } from '../body/RepeatDefinition.ts';
+import { RepeatElementDefinition } from '../body/RepeatElementDefinition.ts';
 import { BindDefinition } from './BindDefinition.ts';
 import { RepeatInstanceDefinition } from './RepeatInstanceDefinition.ts';
-import { RepeatSequenceDefinition } from './RepeatSequenceDefinition.ts';
+import { RepeatRangeDefinition } from './RepeatRangeDefinition.ts';
 import { RepeatTemplateDefinition } from './RepeatTemplateDefinition.ts';
 import { RootDefinition } from './RootDefinition.ts';
 import { SubtreeDefinition } from './SubtreeDefinition.ts';
@@ -16,12 +16,12 @@ import { ValueNodeDefinition } from './ValueNodeDefinition.ts';
  */
 export type RootNodeType = 'root';
 /**
- * Corresponds to a sequence of model/entry DOM subtrees which in turn
+ * Corresponds to a range/sequence of model/entry DOM subtrees which in turn
  * corresponds to a <repeat> in the form body definition.
  */
-export type RepeatSequenceType = 'repeat-sequence';
+export type RepeatRangeType = 'repeat-range';
 /**
- * Corresponds to a template definition for a repeat sequence, which either has
+ * Corresponds to a template definition for a repeat range, which either has
  * an explicit `jr:template=""` attribute in the form definition or is inferred
  * as a template from the form's first element matched by a <repeat nodeset>.
  */
@@ -29,7 +29,7 @@ export type RepeatTemplateType = 'repeat-template';
 /**
  * Corresponds to a single instance of a model/entry DOM subtree which
  * in turn corresponds to a <repeat> in the form body definition, and a
- * 'repeat-sequence' definition.
+ * 'repeat-range' definition.
  */
 export type RepeatInstanceType = 'repeat-instance';
 /**
@@ -45,21 +45,21 @@ export type SubtreeNodeType = 'subtree';
  * - Any attribute corresponding to a bind's `nodeset` expression
  */
 export type ValueNodeType = 'value-node';
-export type NodeDefinitionType = RootNodeType | RepeatSequenceType | RepeatTemplateType | RepeatInstanceType | SubtreeNodeType | ValueNodeType;
+export type NodeDefinitionType = RootNodeType | RepeatRangeType | RepeatTemplateType | RepeatInstanceType | SubtreeNodeType | ValueNodeType;
 export type ParentNodeDefinition = RootDefinition | RepeatTemplateDefinition | RepeatInstanceDefinition | SubtreeDefinition;
-export type ChildNodeDefinition = RepeatSequenceDefinition | SubtreeDefinition | ValueNodeDefinition;
+export type ChildNodeDefinition = RepeatRangeDefinition | SubtreeDefinition | ValueNodeDefinition;
 export type ChildNodeInstanceDefinition = RepeatTemplateDefinition | RepeatInstanceDefinition | SubtreeDefinition | ValueNodeDefinition;
 export type NodeChildren<Type extends NodeDefinitionType> = Type extends ParentNodeDefinition['type'] ? readonly ChildNodeDefinition[] : null;
-export type NodeInstances<Type extends NodeDefinitionType> = Type extends 'repeat-sequence' ? readonly RepeatInstanceDefinition[] : null;
+export type NodeInstances<Type extends NodeDefinitionType> = Type extends 'repeat-range' ? readonly RepeatInstanceDefinition[] : null;
 export type NodeParent<Type extends NodeDefinitionType> = Type extends ChildNodeDefinition['type'] | ChildNodeInstanceDefinition['type'] ? ParentNodeDefinition : null;
-export type ModelNode<Type extends NodeDefinitionType> = Type extends 'repeat-sequence' ? null : Element;
+export type ModelNode<Type extends NodeDefinitionType> = Type extends 'repeat-range' ? null : Element;
 export type NodeDefaultValue<Type extends NodeDefinitionType> = Type extends 'value-node' ? string : null;
 export interface NodeDefinition<Type extends NodeDefinitionType> {
     readonly type: Type;
     readonly bind: BindDefinition;
     readonly nodeset: string;
     readonly nodeName: string;
-    readonly bodyElement: AnyBodyElementDefinition | RepeatDefinition | null;
+    readonly bodyElement: AnyBodyElementDefinition | RepeatElementDefinition | null;
     readonly isTranslated: boolean;
     readonly dependencyExpressions: ReadonlySet<string>;
     readonly root: RootDefinition;
@@ -69,7 +69,7 @@ export interface NodeDefinition<Type extends NodeDefinitionType> {
     readonly node: ModelNode<Type>;
     readonly defaultValue: NodeDefaultValue<Type>;
 }
-export type AnyNodeDefinition = RootDefinition | RepeatSequenceDefinition | RepeatTemplateDefinition | RepeatInstanceDefinition | SubtreeDefinition | ValueNodeDefinition;
+export type AnyNodeDefinition = RootDefinition | RepeatRangeDefinition | RepeatTemplateDefinition | RepeatInstanceDefinition | SubtreeDefinition | ValueNodeDefinition;
 export type TypedNodeDefinition<Type> = Extract<AnyNodeDefinition, {
     readonly type: Type;
 }>;

package/dist/model/RepeatInstanceDefinition.d.ts

@@ -1,16 +1,15 @@
-import { RepeatDefinition } from '../body/RepeatDefinition.ts';
+import { RepeatElementDefinition } from '../body/RepeatElementDefinition.ts';
 import { DescendentNodeDefinition } from './DescendentNodeDefinition.ts';
 import { ChildNodeDefinition, NodeDefinition } from './NodeDefinition.ts';
-import { RepeatSequenceDefinition } from './RepeatSequenceDefinition.ts';
+import { RepeatRangeDefinition } from './RepeatRangeDefinition.ts';
 
-export declare class RepeatInstanceDefinition extends DescendentNodeDefinition<'repeat-instance', RepeatDefinition> implements NodeDefinition<'repeat-instance'> {
-    protected readonly sequence: RepeatSequenceDefinition;
+export declare class RepeatInstanceDefinition extends DescendentNodeDefinition<'repeat-instance', RepeatElementDefinition> implements NodeDefinition<'repeat-instance'> {
     readonly node: Element;
     readonly type = "repeat-instance";
     readonly nodeName: string;
     readonly children: readonly ChildNodeDefinition[];
     readonly instances: null;
     readonly defaultValue: null;
-    constructor(sequence: RepeatSequenceDefinition, node: Element);
-    toJSON(): Omit<this, "toJSON" | "parent" | "bind" | "root" | "bodyElement" | "sequence">;
+    constructor(range: RepeatRangeDefinition, node: Element);
+    toJSON(): Omit<this, "toJSON" | "parent" | "bind" | "root" | "bodyElement">;
 }

package/dist/model/{RepeatSequenceDefinition.d.ts → RepeatRangeDefinition.d.ts}

@@ -1,20 +1,20 @@
-import { RepeatGroupDefinition } from '../body/group/RepeatGroupDefinition.ts';
+import { RepeatElementDefinition } from '../body/RepeatElementDefinition.ts';
 import { BindDefinition } from './BindDefinition.ts';
 import { DescendentNodeDefinition } from './DescendentNodeDefinition.ts';
 import { NodeDefinition, ParentNodeDefinition } from './NodeDefinition.ts';
 import { RepeatInstanceDefinition } from './RepeatInstanceDefinition.ts';
 import { RepeatTemplateDefinition } from './RepeatTemplateDefinition.ts';
 
-export declare class RepeatSequenceDefinition extends DescendentNodeDefinition<'repeat-sequence', RepeatGroupDefinition> implements NodeDefinition<'repeat-sequence'> {
+export declare class RepeatRangeDefinition extends DescendentNodeDefinition<'repeat-range', RepeatElementDefinition> implements NodeDefinition<'repeat-range'> {
     static createTemplateElement(instanceElement: Element): Element;
     static createInstanceElement(templateElement: Element): Element;
-    readonly type = "repeat-sequence";
+    readonly type = "repeat-range";
     readonly template: RepeatTemplateDefinition;
     readonly children: null;
     readonly instances: RepeatInstanceDefinition[];
     readonly node: null;
     readonly nodeName: string;
     readonly defaultValue: null;
-    constructor(parent: ParentNodeDefinition, bind: BindDefinition, bodyElement: RepeatGroupDefinition, modelNodes: readonly [Element, ...Element[]]);
+    constructor(parent: ParentNodeDefinition, bind: BindDefinition, bodyElement: RepeatElementDefinition, modelNodes: readonly [Element, ...Element[]]);
     toJSON(): Omit<this, "toJSON" | "parent" | "bind" | "root" | "bodyElement">;
 }

package/dist/model/RepeatTemplateDefinition.d.ts

@@ -1,8 +1,8 @@
 import { JAVAROSA_NAMESPACE_URI } from '../../../common/src/constants/xmlns.ts';
-import { RepeatDefinition } from '../body/RepeatDefinition.ts';
+import { RepeatElementDefinition } from '../body/RepeatElementDefinition.ts';
 import { DescendentNodeDefinition } from './DescendentNodeDefinition.ts';
 import { ChildNodeDefinition, NodeDefinition } from './NodeDefinition.ts';
-import { RepeatSequenceDefinition } from './RepeatSequenceDefinition.ts';
+import { RepeatRangeDefinition } from './RepeatRangeDefinition.ts';
 
 interface ExplicitRepeatTemplateElement extends Element {
     getAttributeNS(namespaceURI: typeof JAVAROSA_NAMESPACE_URI, name: 'template'): string;
@@ -14,17 +14,16 @@ interface ParsedRepeatNodes {
     readonly template: RepeatTemplateDefinition;
     readonly instanceNodes: readonly Element[];
 }
-export declare class RepeatTemplateDefinition extends DescendentNodeDefinition<'repeat-template', RepeatDefinition> implements NodeDefinition<'repeat-template'> {
-    protected readonly sequence: RepeatSequenceDefinition;
+export declare class RepeatTemplateDefinition extends DescendentNodeDefinition<'repeat-template', RepeatElementDefinition> implements NodeDefinition<'repeat-template'> {
     protected readonly templateNode: ExplicitRepeatTemplateElement;
-    static parseModelNodes(sequence: RepeatSequenceDefinition, modelNodes: readonly [Element, ...Element[]]): ParsedRepeatNodes;
+    static parseModelNodes(range: RepeatRangeDefinition, modelNodes: readonly [Element, ...Element[]]): ParsedRepeatNodes;
     readonly type = "repeat-template";
     readonly node: Element;
     readonly nodeName: string;
     readonly children: readonly ChildNodeDefinition[];
     readonly instances: null;
     readonly defaultValue: null;
-    protected constructor(sequence: RepeatSequenceDefinition, templateNode: ExplicitRepeatTemplateElement);
-    toJSON(): Omit<this, "toJSON" | "parent" | "bind" | "root" | "bodyElement" | "sequence">;
+    protected constructor(range: RepeatRangeDefinition, templateNode: ExplicitRepeatTemplateElement);
+    toJSON(): Omit<this, "toJSON" | "parent" | "bind" | "root" | "bodyElement">;
 }
 export {};

package/dist/model/RootDefinition.d.ts

@@ -1,4 +1,5 @@
 import { XFormDefinition } from '../XFormDefinition.ts';
+import { BodyClassList } from '../body/BodyDefinition.ts';
 import { BindDefinition } from './BindDefinition.ts';
 import { ModelDefinition } from './ModelDefinition.ts';
 import { ChildNodeDefinition, NodeDefinition, ParentNodeDefinition } from './NodeDefinition.ts';
@@ -6,6 +7,7 @@ import { ChildNodeDefinition, NodeDefinition, ParentNodeDefinition } from './Nod
 export declare class RootDefinition implements NodeDefinition<'root'> {
     protected readonly form: XFormDefinition;
     protected readonly model: ModelDefinition;
+    readonly classes: BodyClassList;
     readonly type = "root";
     readonly bind: BindDefinition;
     readonly nodeset: string;
@@ -19,7 +21,7 @@ export declare class RootDefinition implements NodeDefinition<'root'> {
     readonly defaultValue: null;
     readonly isTranslated = false;
     readonly dependencyExpressions: ReadonlySet<string>;
-    constructor(form: XFormDefinition, model: ModelDefinition);
+    constructor(form: XFormDefinition, model: ModelDefinition, classes: BodyClassList);
     buildSubtree(parent: ParentNodeDefinition): readonly ChildNodeDefinition[];
     toJSON(): Omit<this, "model" | "toJSON" | "form" | "bind" | "root" | "bodyElement" | "buildSubtree">;
 }

package/dist/model/SubtreeDefinition.d.ts

@@ -1,9 +1,9 @@
-import { AnyBodyElementDefinition, NonRepeatGroupElementDefinition } from '../body/BodyDefinition.ts';
+import { AnyBodyElementDefinition, AnyGroupElementDefinition } from '../body/BodyDefinition.ts';
 import { BindDefinition } from './BindDefinition.ts';
 import { DescendentNodeDefinition } from './DescendentNodeDefinition.ts';
 import { ChildNodeDefinition, NodeDefinition, ParentNodeDefinition } from './NodeDefinition.ts';
 
-export declare class SubtreeDefinition extends DescendentNodeDefinition<'subtree', NonRepeatGroupElementDefinition | null> implements NodeDefinition<'subtree'> {
+export declare class SubtreeDefinition extends DescendentNodeDefinition<'subtree', AnyGroupElementDefinition | null> implements NodeDefinition<'subtree'> {
     readonly node: Element;
     readonly type = "subtree";
     readonly nodeName: string;

package/dist/model/ValueNodeDefinition.d.ts

@@ -1,10 +1,9 @@
-import { AnyBodyElementDefinition } from '../body/BodyDefinition.ts';
-import { AnyControlDefinition } from '../body/control/ControlDefinition.ts';
+import { AnyBodyElementDefinition, ControlElementDefinition } from '../body/BodyDefinition.ts';
 import { BindDefinition } from './BindDefinition.ts';
 import { DescendentNodeDefinition } from './DescendentNodeDefinition.ts';
 import { NodeDefinition, ParentNodeDefinition } from './NodeDefinition.ts';
 
-export declare class ValueNodeDefinition extends DescendentNodeDefinition<'value-node', AnyControlDefinition | null> implements NodeDefinition<'value-node'> {
+export declare class ValueNodeDefinition extends DescendentNodeDefinition<'value-node', ControlElementDefinition | null> implements NodeDefinition<'value-node'> {
     readonly node: Element;
     readonly type = "value-node";
     readonly nodeName: string;