worldorbit 2.5.16 → 2.6.0

package/packages/core/dist/draft-parse.js

@@ -74,6 +74,23 @@ for (const spec of [
     });
 }
 const DRAFT_OBJECT_FIELD_KEYS = new Set(DRAFT_OBJECT_FIELD_SPECS.keys());
+const EVENT_POSE_FIELD_KEYS = new Set([
+    "orbit",
+    "distance",
+    "semiMajor",
+    "eccentricity",
+    "period",
+    "angle",
+    "inclination",
+    "phase",
+    "at",
+    "surface",
+    "free",
+    "inner",
+    "outer",
+    "epoch",
+    "referencePlane",
+]);
 export function parseWorldOrbitAtlas(source) {
     return parseAtlasSource(source);
 }
@@ -91,12 +108,15 @@ function parseAtlasSource(source, forcedOutputVersion) {
     const objectNodes = [];
     const groups = [];
     const relations = [];
+    const events = [];
+    const eventPoseNodes = new Map();
     let sawDefaults = false;
     let sawAtlas = false;
     const viewpointIds = new Set();
     const annotationIds = new Set();
     const groupIds = new Set();
     const relationIds = new Set();
+    const eventIds = new Set();
     for (let index = 0; index < lines.length; index++) {
         const rawLine = lines[index];
         const lineNumber = index + 1;
@@ -114,7 +134,7 @@ function parseAtlasSource(source, forcedOutputVersion) {
         if (!sawSchemaHeader) {
             sourceSchemaVersion = assertDraftSchemaHeader(tokens, lineNumber);
             sawSchemaHeader = true;
-            if (prepared.comments.length > 0 && sourceSchemaVersion !== "2.1") {
+            if (prepared.comments.length > 0 && isSchemaOlderThan(sourceSchemaVersion, "2.1")) {
                 diagnostics.push({
                     code: "parse.schema21.commentCompatibility",
                     severity: "warning",
@@ -127,7 +147,7 @@ function parseAtlasSource(source, forcedOutputVersion) {
             continue;
         }
         if (indent === 0) {
-            section = startTopLevelSection(tokens, lineNumber, sourceSchemaVersion, diagnostics, system, objectNodes, groups, relations, viewpointIds, annotationIds, groupIds, relationIds, { sawDefaults, sawAtlas });
+            section = startTopLevelSection(tokens, lineNumber, sourceSchemaVersion, diagnostics, system, objectNodes, groups, relations, events, eventPoseNodes, viewpointIds, annotationIds, groupIds, relationIds, eventIds, { sawDefaults, sawAtlas });
             if (section.kind === "system") {
                 system = section.system;
             }
@@ -148,6 +168,7 @@ function parseAtlasSource(source, forcedOutputVersion) {
         throw new WorldOrbitError('Missing required atlas schema header "schema 2.0"');
     }
     const objects = objectNodes.map((node) => normalizeDraftObject(node, sourceSchemaVersion, diagnostics));
+    const normalizedEvents = events.map((event) => normalizeDraftEvent(event, eventPoseNodes.get(event.id) ?? []));
     const outputVersion = forcedOutputVersion ??
         (sourceSchemaVersion === "2.0-draft" ? "2.0" : sourceSchemaVersion);
     const baseDocument = {
@@ -156,6 +177,7 @@ function parseAtlasSource(source, forcedOutputVersion) {
         system,
         groups,
         relations,
+        events: normalizedEvents,
         objects,
         diagnostics,
     };
@@ -187,17 +209,19 @@ function parseAtlasSource(source, forcedOutputVersion) {
 function assertDraftSchemaHeader(tokens, line) {
     if (tokens.length !== 2 ||
         tokens[0].value.toLowerCase() !== "schema" ||
-        !["2.0-draft", "2.0", "2.1"].includes(tokens[1].value.toLowerCase())) {
-        throw new WorldOrbitError('Expected atlas header "schema 2.0", "schema 2.1", or legacy "schema 2.0-draft"', line, tokens[0]?.column ?? 1);
+        !["2.0-draft", "2.0", "2.1", "2.5"].includes(tokens[1].value.toLowerCase())) {
+        throw new WorldOrbitError('Expected atlas header "schema 2.0", "schema 2.1", "schema 2.5", or legacy "schema 2.0-draft"', line, tokens[0]?.column ?? 1);
     }
     const version = tokens[1].value.toLowerCase();
-    return version === "2.1"
-        ? "2.1"
-        : version === "2.0-draft"
-            ? "2.0-draft"
-            : "2.0";
+    return version === "2.5"
+        ? "2.5"
+        : version === "2.1"
+            ? "2.1"
+            : version === "2.0-draft"
+                ? "2.0-draft"
+                : "2.0";
 }
-function startTopLevelSection(tokens, line, sourceSchemaVersion, diagnostics, system, objectNodes, groups, relations, viewpointIds, annotationIds, groupIds, relationIds, flags) {
+function startTopLevelSection(tokens, line, sourceSchemaVersion, diagnostics, system, objectNodes, groups, relations, events, eventPoseNodes, viewpointIds, annotationIds, groupIds, relationIds, eventIds, flags) {
     const keyword = tokens[0]?.value.toLowerCase();
     switch (keyword) {
         case "system":
@@ -215,6 +239,8 @@ function startTopLevelSection(tokens, line, sourceSchemaVersion, diagnostics, sy
             return {
                 kind: "defaults",
                 system,
+                sourceSchemaVersion,
+                diagnostics,
                 seenFields: new Set(),
             };
         case "atlas":
@@ -234,7 +260,7 @@ function startTopLevelSection(tokens, line, sourceSchemaVersion, diagnostics, sy
             if (!system) {
                 throw new WorldOrbitError('Atlas section "viewpoint" requires a preceding system declaration', line, tokens[0].column);
             }
-            return startViewpointSection(tokens, line, system, viewpointIds);
+            return startViewpointSection(tokens, line, system, viewpointIds, sourceSchemaVersion, diagnostics);
         case "annotation":
             if (!system) {
                 throw new WorldOrbitError('Atlas section "annotation" requires a preceding system declaration', line, tokens[0].column);
@@ -246,6 +272,9 @@ function startTopLevelSection(tokens, line, sourceSchemaVersion, diagnostics, sy
         case "relation":
             warnIfSchema21Feature(sourceSchemaVersion, diagnostics, "relation", { line, column: tokens[0].column });
             return startRelationSection(tokens, line, relations, relationIds);
+        case "event":
+            warnIfSchema21Feature(sourceSchemaVersion, diagnostics, "event", { line, column: tokens[0].column });
+            return startEventSection(tokens, line, events, eventPoseNodes, eventIds, sourceSchemaVersion, diagnostics);
         case "object":
             return startObjectSection(tokens, line, sourceSchemaVersion, diagnostics, objectNodes);
         default:
@@ -282,7 +311,7 @@ function startSystemSection(tokens, line, sourceSchemaVersion, diagnostics) {
         seenFields: new Set(),
     };
 }
-function startViewpointSection(tokens, line, system, viewpointIds) {
+function startViewpointSection(tokens, line, system, viewpointIds, sourceSchemaVersion, diagnostics) {
     if (tokens.length !== 2) {
         throw new WorldOrbitError("Invalid viewpoint declaration", line, tokens[0]?.column ?? 1);
     }
@@ -299,10 +328,12 @@ function startViewpointSection(tokens, line, system, viewpointIds) {
         summary: "",
         focusObjectId: null,
         selectedObjectId: null,
+        events: [],
         projection: system.defaults.view,
         preset: system.defaults.preset,
         zoom: null,
         rotationDeg: 0,
+        camera: null,
         layers: {},
         filter: null,
     };
@@ -311,10 +342,15 @@ function startViewpointSection(tokens, line, system, viewpointIds) {
     return {
         kind: "viewpoint",
         viewpoint,
+        sourceSchemaVersion,
+        diagnostics,
         seenFields: new Set(),
         inFilter: false,
         filterIndent: null,
         seenFilterFields: new Set(),
+        inCamera: false,
+        cameraIndent: null,
+        seenCameraFields: new Set(),
     };
 }
 function startAnnotationSection(tokens, line, system, annotationIds) {
@@ -401,6 +437,51 @@ function startRelationSection(tokens, line, relations, relationIds) {
         seenFields: new Set(),
     };
 }
+function startEventSection(tokens, line, events, eventPoseNodes, eventIds, sourceSchemaVersion, diagnostics) {
+    if (tokens.length !== 2) {
+        throw new WorldOrbitError("Invalid event declaration", line, tokens[0]?.column ?? 1);
+    }
+    const id = normalizeIdentifier(tokens[1].value);
+    if (!id) {
+        throw new WorldOrbitError("Event id must not be empty", line, tokens[1].column);
+    }
+    if (eventIds.has(id)) {
+        throw new WorldOrbitError(`Duplicate event id "${id}"`, line, tokens[1].column);
+    }
+    const event = {
+        id,
+        kind: "",
+        label: humanizeIdentifier(id),
+        summary: null,
+        targetObjectId: null,
+        participantObjectIds: [],
+        timing: null,
+        visibility: null,
+        epoch: null,
+        referencePlane: null,
+        tags: [],
+        color: null,
+        hidden: false,
+        positions: [],
+    };
+    const rawPoses = [];
+    events.push(event);
+    eventPoseNodes.set(id, rawPoses);
+    eventIds.add(id);
+    return {
+        kind: "event",
+        event,
+        sourceSchemaVersion,
+        diagnostics,
+        seenFields: new Set(),
+        rawPoses,
+        inPositions: false,
+        positionsIndent: null,
+        activePose: null,
+        poseIndent: null,
+        activePoseSeenFields: new Set(),
+    };
+}
 function startObjectSection(tokens, line, sourceSchemaVersion, diagnostics, objectNodes) {
     if (tokens.length < 3) {
         throw new WorldOrbitError("Invalid atlas object declaration", line, tokens[0]?.column ?? 1);
@@ -457,6 +538,9 @@ function handleSectionLine(section, indent, tokens, line) {
         case "relation":
             applyRelationField(section, tokens, line);
             return;
+        case "event":
+            applyEventField(section, indent, tokens, line);
+            return;
         case "object":
             applyObjectField(section, indent, tokens, line);
             return;
@@ -499,6 +583,12 @@ function applyDefaultsField(section, tokens, line) {
     const value = joinFieldValue(tokens, line);
     switch (key) {
         case "view":
+            if (isSchema25Projection(value)) {
+                warnIfSchema25Feature(section.sourceSchemaVersion, section.diagnostics, "defaults.view", {
+                    line,
+                    column: tokens[0].column,
+                });
+            }
             section.system.defaults.view = parseProjectionValue(value, line, tokens[0].column);
             return;
         case "scale":
@@ -538,14 +628,36 @@ function applyAtlasField(section, indent, tokens, line) {
     throw new WorldOrbitError(`Unknown atlas field "${tokens[0].value}"`, line, tokens[0].column);
 }
 function applyViewpointField(section, indent, tokens, line) {
+    if (section.inCamera && indent <= (section.cameraIndent ?? 0)) {
+        section.inCamera = false;
+        section.cameraIndent = null;
+    }
     if (section.inFilter && indent <= (section.filterIndent ?? 0)) {
         section.inFilter = false;
         section.filterIndent = null;
     }
+    if (section.inCamera) {
+        applyViewpointCameraField(section, tokens, line);
+        return;
+    }
     if (section.inFilter) {
         applyViewpointFilterField(section, tokens, line);
         return;
     }
+    if (tokens.length === 1 && tokens[0].value.toLowerCase() === "camera") {
+        warnIfSchema25Feature(section.sourceSchemaVersion, section.diagnostics, "viewpoint.camera", {
+            line,
+            column: tokens[0].column,
+        });
+        if (section.seenFields.has("camera")) {
+            throw new WorldOrbitError('Duplicate viewpoint field "camera"', line, tokens[0].column);
+        }
+        section.seenFields.add("camera");
+        section.inCamera = true;
+        section.cameraIndent = indent;
+        section.viewpoint.camera = section.viewpoint.camera ?? createEmptyViewCamera();
+        return;
+    }
     if (tokens.length === 1 && tokens[0].value.toLowerCase() === "filter") {
         if (section.seenFields.has("filter")) {
             throw new WorldOrbitError('Duplicate viewpoint field "filter"', line, tokens[0].column);
@@ -571,6 +683,12 @@ function applyViewpointField(section, indent, tokens, line) {
             section.viewpoint.selectedObjectId = value;
             return;
         case "projection":
+            if (isSchema25Projection(value)) {
+                warnIfSchema25Feature(section.sourceSchemaVersion, section.diagnostics, "projection", {
+                    line,
+                    column: tokens[0].column,
+                });
+            }
             section.viewpoint.projection = parseProjectionValue(value, line, tokens[0].column);
             return;
         case "preset":
@@ -582,13 +700,49 @@ function applyViewpointField(section, indent, tokens, line) {
         case "rotation":
             section.viewpoint.rotationDeg = parseFiniteNumber(value, line, tokens[0].column, "rotation");
             return;
+        case "camera":
+            warnIfSchema25Feature(section.sourceSchemaVersion, section.diagnostics, "viewpoint.camera", {
+                line,
+                column: tokens[0].column,
+            });
+            section.viewpoint.camera = parseInlineViewCamera(tokens.slice(1), line, section.viewpoint.camera);
+            return;
         case "layers":
-            section.viewpoint.layers = parseLayerTokens(tokens.slice(1), line);
+            section.viewpoint.layers = parseLayerTokens(tokens.slice(1), line, section.sourceSchemaVersion, section.diagnostics);
+            return;
+        case "events":
+            warnIfSchema21Feature(section.sourceSchemaVersion, section.diagnostics, "viewpoint.events", {
+                line,
+                column: tokens[0].column,
+            });
+            section.viewpoint.events = parseTokenList(tokens.slice(1), line, "events");
             return;
         default:
             throw new WorldOrbitError(`Unknown viewpoint field "${tokens[0].value}"`, line, tokens[0].column);
     }
 }
+function applyViewpointCameraField(section, tokens, line) {
+    const key = requireUniqueField(tokens, section.seenCameraFields, line);
+    const value = joinFieldValue(tokens, line);
+    const camera = section.viewpoint.camera ?? createEmptyViewCamera();
+    switch (key) {
+        case "azimuth":
+            camera.azimuth = parseFiniteNumber(value, line, tokens[0].column, "camera.azimuth");
+            break;
+        case "elevation":
+            camera.elevation = parseFiniteNumber(value, line, tokens[0].column, "camera.elevation");
+            break;
+        case "roll":
+            camera.roll = parseFiniteNumber(value, line, tokens[0].column, "camera.roll");
+            break;
+        case "distance":
+            camera.distance = parsePositiveNumber(value, line, tokens[0].column, "camera.distance");
+            break;
+        default:
+            throw new WorldOrbitError(`Unknown viewpoint camera field "${tokens[0].value}"`, line, tokens[0].column);
+    }
+    section.viewpoint.camera = camera;
+}
 function applyViewpointFilterField(section, tokens, line) {
     const key = requireUniqueField(tokens, section.seenFilterFields, line);
     const filter = section.viewpoint.filter ?? createEmptyViewpointFilter();
@@ -688,6 +842,127 @@ function applyRelationField(section, tokens, line) {
             throw new WorldOrbitError(`Unknown relation field "${tokens[0].value}"`, line, tokens[0].column);
     }
 }
+function applyEventField(section, indent, tokens, line) {
+    if (section.activePose && indent <= (section.poseIndent ?? 0)) {
+        section.activePose = null;
+        section.poseIndent = null;
+        section.activePoseSeenFields.clear();
+    }
+    if (!section.activePose && section.inPositions && indent <= (section.positionsIndent ?? 0)) {
+        section.inPositions = false;
+        section.positionsIndent = null;
+    }
+    if (section.activePose) {
+        if (tokens[0]?.value === "epoch" ||
+            tokens[0]?.value === "referencePlane") {
+            warnIfSchema25Feature(section.sourceSchemaVersion, section.diagnostics, `pose.${tokens[0].value}`, {
+                line,
+                column: tokens[0]?.column ?? 1,
+            });
+        }
+        section.activePose.fields.push(parseEventPoseField(tokens, line, section.activePoseSeenFields));
+        return;
+    }
+    if (section.inPositions) {
+        if (tokens.length !== 2 || tokens[0].value.toLowerCase() !== "pose") {
+            throw new WorldOrbitError(`Unknown event positions field "${tokens[0].value}"`, line, tokens[0]?.column ?? 1);
+        }
+        const objectId = tokens[1].value;
+        if (!objectId.trim()) {
+            throw new WorldOrbitError("Event pose object id must not be empty", line, tokens[1].column);
+        }
+        const rawPose = {
+            objectId,
+            fields: [],
+            location: { line, column: tokens[0].column },
+        };
+        section.rawPoses.push(rawPose);
+        section.activePose = rawPose;
+        section.poseIndent = indent;
+        section.activePoseSeenFields = new Set();
+        return;
+    }
+    if (tokens.length === 1 && tokens[0].value.toLowerCase() === "positions") {
+        if (section.seenFields.has("positions")) {
+            throw new WorldOrbitError('Duplicate event field "positions"', line, tokens[0].column);
+        }
+        section.seenFields.add("positions");
+        section.inPositions = true;
+        section.positionsIndent = indent;
+        return;
+    }
+    const key = requireUniqueField(tokens, section.seenFields, line);
+    switch (key) {
+        case "kind":
+            section.event.kind = joinFieldValue(tokens, line);
+            return;
+        case "label":
+            section.event.label = joinFieldValue(tokens, line);
+            return;
+        case "summary":
+            section.event.summary = joinFieldValue(tokens, line);
+            return;
+        case "target":
+            section.event.targetObjectId = joinFieldValue(tokens, line);
+            return;
+        case "participants":
+            section.event.participantObjectIds = parseTokenList(tokens.slice(1), line, "participants");
+            return;
+        case "timing":
+            section.event.timing = joinFieldValue(tokens, line);
+            return;
+        case "visibility":
+            section.event.visibility = joinFieldValue(tokens, line);
+            return;
+        case "epoch":
+            warnIfSchema25Feature(section.sourceSchemaVersion, section.diagnostics, "event.epoch", {
+                line,
+                column: tokens[0].column,
+            });
+            section.event.epoch = joinFieldValue(tokens, line);
+            return;
+        case "referenceplane":
+            warnIfSchema25Feature(section.sourceSchemaVersion, section.diagnostics, "event.referencePlane", {
+                line,
+                column: tokens[0].column,
+            });
+            section.event.referencePlane = joinFieldValue(tokens, line);
+            return;
+        case "tags":
+            section.event.tags = parseTokenList(tokens.slice(1), line, "tags");
+            return;
+        case "color":
+            section.event.color = joinFieldValue(tokens, line);
+            return;
+        case "hidden":
+            section.event.hidden = parseAtlasBoolean(joinFieldValue(tokens, line), "hidden", {
+                line,
+                column: tokens[0].column,
+            });
+            return;
+        default:
+            throw new WorldOrbitError(`Unknown event field "${tokens[0].value}"`, line, tokens[0].column);
+    }
+}
+function parseEventPoseField(tokens, line, seenFields) {
+    if (tokens.length < 2) {
+        throw new WorldOrbitError("Invalid event pose field line", line, tokens[0]?.column ?? 1);
+    }
+    const key = tokens[0].value;
+    if (!EVENT_POSE_FIELD_KEYS.has(key)) {
+        throw new WorldOrbitError(`Unknown event pose field "${key}"`, line, tokens[0].column);
+    }
+    if (seenFields.has(key)) {
+        throw new WorldOrbitError(`Duplicate event pose field "${key}"`, line, tokens[0].column);
+    }
+    seenFields.add(key);
+    return {
+        type: "field",
+        key,
+        values: tokens.slice(1).map((token) => token.value),
+        location: { line, column: tokens[0].column },
+    };
+}
 function applyObjectField(section, indent, tokens, line) {
     if (section.activeBlock && indent <= (section.blockIndent ?? 0)) {
         section.activeBlock = null;
@@ -760,7 +1035,7 @@ function parseObjectTypeTokens(tokens, line) {
         value === "structure" ||
         value === "phenomenon");
 }
-function parseLayerTokens(tokens, line) {
+function parseLayerTokens(tokens, line, sourceSchemaVersion, diagnostics) {
     const layers = {};
     for (const token of parseTokenList(tokens, line, "layers")) {
         const enabled = !token.startsWith("-") && !token.startsWith("!");
@@ -775,9 +1050,16 @@ function parseLayerTokens(tokens, line) {
             raw === "orbits-back" ||
             raw === "orbits-front" ||
             raw === "relations" ||
+            raw === "events" ||
             raw === "objects" ||
             raw === "labels" ||
             raw === "metadata") {
+            if (raw === "events" && sourceSchemaVersion && diagnostics) {
+                warnIfSchema21Feature(sourceSchemaVersion, diagnostics, "layers.events", {
+                    line,
+                    column: tokens[0]?.column ?? 1,
+                });
+            }
             layers[raw] = enabled;
         }
     }
@@ -795,11 +1077,18 @@ function parseTokenList(tokens, line, fieldName) {
 }
 function parseProjectionValue(value, line, column) {
     const normalized = value.toLowerCase();
-    if (normalized !== "topdown" && normalized !== "isometric") {
+    if (normalized !== "topdown" &&
+        normalized !== "isometric" &&
+        normalized !== "orthographic" &&
+        normalized !== "perspective") {
         throw new WorldOrbitError(`Unknown projection "${value}"`, line, column);
     }
     return normalized;
 }
+function isSchema25Projection(value) {
+    const normalized = value.toLowerCase();
+    return normalized === "orthographic" || normalized === "perspective";
+}
 function parsePresetValue(value, line, column) {
     const normalized = value.toLowerCase();
     if (normalized === "diagram" ||
@@ -832,6 +1121,48 @@ function createEmptyViewpointFilter() {
         groupIds: [],
     };
 }
+function createEmptyViewCamera() {
+    return {
+        azimuth: null,
+        elevation: null,
+        roll: null,
+        distance: null,
+    };
+}
+function parseInlineViewCamera(tokens, line, current) {
+    if (tokens.length === 0 || tokens.length % 2 !== 0) {
+        throw new WorldOrbitError('Field "camera" expects "<field> <value>" pairs', line, tokens[0]?.column ?? 1);
+    }
+    const camera = current ? { ...current } : createEmptyViewCamera();
+    const seen = new Set();
+    for (let index = 0; index < tokens.length; index += 2) {
+        const fieldToken = tokens[index];
+        const valueToken = tokens[index + 1];
+        const key = fieldToken.value.toLowerCase();
+        if (seen.has(key)) {
+            throw new WorldOrbitError(`Duplicate viewpoint camera field "${fieldToken.value}"`, line, fieldToken.column);
+        }
+        seen.add(key);
+        const value = valueToken.value;
+        switch (key) {
+            case "azimuth":
+                camera.azimuth = parseFiniteNumber(value, line, fieldToken.column, "camera.azimuth");
+                break;
+            case "elevation":
+                camera.elevation = parseFiniteNumber(value, line, fieldToken.column, "camera.elevation");
+                break;
+            case "roll":
+                camera.roll = parseFiniteNumber(value, line, fieldToken.column, "camera.roll");
+                break;
+            case "distance":
+                camera.distance = parsePositiveNumber(value, line, fieldToken.column, "camera.distance");
+                break;
+            default:
+                throw new WorldOrbitError(`Unknown viewpoint camera field "${fieldToken.value}"`, line, fieldToken.column);
+        }
+    }
+    return camera;
+}
 function parseInlineObjectFields(tokens, line, objectType, sourceSchemaVersion, diagnostics) {
     const fields = [];
     let index = 0;
@@ -921,7 +1252,7 @@ function parseInfoLikeEntry(tokens, line, errorMessage) {
 }
 function normalizeDraftObject(node, sourceSchemaVersion, diagnostics) {
     const fieldMap = collectDraftFields(node.fields);
-    const placement = extractDraftPlacement(node.objectType, fieldMap);
+    const placement = extractPlacementFromFieldMap(fieldMap);
     const properties = normalizeDraftProperties(node.objectType, fieldMap);
     const groups = parseOptionalTokenList(fieldMap.get("groups")?.[0]);
     const epoch = parseOptionalJoinedValue(fieldMap.get("epoch")?.[0]);
@@ -972,7 +1303,7 @@ function normalizeDraftObject(node, sourceSchemaVersion, diagnostics) {
         object.tolerances = tolerances;
     if (typedBlocks && Object.keys(typedBlocks).length > 0)
         object.typedBlocks = typedBlocks;
-    if (sourceSchemaVersion !== "2.1") {
+    if (isSchemaOlderThan(sourceSchemaVersion, "2.1")) {
         if (object.groups ||
             object.epoch ||
             object.referencePlane ||
@@ -989,14 +1320,34 @@ function normalizeDraftObject(node, sourceSchemaVersion, diagnostics) {
     }
     return object;
 }
-function collectDraftFields(fields) {
+function normalizeDraftEvent(event, rawPoses) {
+    return {
+        ...event,
+        participantObjectIds: [...new Set(event.participantObjectIds)],
+        tags: [...new Set(event.tags)],
+        positions: rawPoses.map((pose) => normalizeDraftEventPose(pose)),
+    };
+}
+function normalizeDraftEventPose(rawPose) {
+    const fieldMap = collectDraftFields(rawPose.fields, "event-pose");
+    const placement = extractPlacementFromFieldMap(fieldMap);
+    return {
+        objectId: rawPose.objectId,
+        placement,
+        inner: parseOptionalUnitField(fieldMap.get("inner")?.[0], "inner"),
+        outer: parseOptionalUnitField(fieldMap.get("outer")?.[0], "outer"),
+        epoch: parseOptionalJoinedValue(fieldMap.get("epoch")?.[0]),
+        referencePlane: parseOptionalJoinedValue(fieldMap.get("referencePlane")?.[0]),
+    };
+}
+function collectDraftFields(fields, _mode = "object") {
     const grouped = new Map();
     for (const field of fields) {
         const spec = getDraftObjectFieldSpec(field.key);
-        if (!spec) {
+        if (!spec && !EVENT_POSE_FIELD_KEYS.has(field.key)) {
             throw WorldOrbitError.fromLocation(`Unknown field "${field.key}"`, field.location);
         }
-        if (!spec.allowRepeat && grouped.has(field.key)) {
+        if (!spec?.allowRepeat && grouped.has(field.key)) {
             throw WorldOrbitError.fromLocation(`Duplicate field "${field.key}"`, field.location);
         }
         const existing = grouped.get(field.key) ?? [];
@@ -1005,7 +1356,7 @@ function collectDraftFields(fields) {
     }
     return grouped;
 }
-function extractDraftPlacement(objectType, fieldMap) {
+function extractPlacementFromFieldMap(fieldMap) {
     const orbitField = fieldMap.get("orbit")?.[0];
     const atField = fieldMap.get("at")?.[0];
     const surfaceField = fieldMap.get("surface")?.[0];
@@ -1174,7 +1525,7 @@ function validateDraftObjectFieldCompatibility(fields, objectType) {
     }
 }
 function warnIfSchema21Feature(sourceSchemaVersion, diagnostics, featureName, location) {
-    if (sourceSchemaVersion === "2.1") {
+    if (!isSchemaOlderThan(sourceSchemaVersion, "2.1")) {
         return;
     }
     diagnostics.push({
@@ -1186,6 +1537,34 @@ function warnIfSchema21Feature(sourceSchemaVersion, diagnostics, featureName, lo
         column: location.column,
     });
 }
+function warnIfSchema25Feature(sourceSchemaVersion, diagnostics, featureName, location) {
+    if (!isSchemaOlderThan(sourceSchemaVersion, "2.5")) {
+        return;
+    }
+    diagnostics.push({
+        code: "parse.schema25.featureCompatibility",
+        severity: "warning",
+        source: "parse",
+        message: `Feature "${featureName}" requires schema 2.5; parsed in compatibility mode because the document header is "schema ${sourceSchemaVersion}".`,
+        line: location.line,
+        column: location.column,
+    });
+}
+function isSchemaOlderThan(sourceSchemaVersion, requiredVersion) {
+    return schemaVersionRank(sourceSchemaVersion) < schemaVersionRank(requiredVersion);
+}
+function schemaVersionRank(version) {
+    switch (version) {
+        case "2.0-draft":
+            return 0;
+        case "2.0":
+            return 1;
+        case "2.1":
+            return 2;
+        case "2.5":
+            return 3;
+    }
+}
 function preprocessAtlasSource(source) {
     const chars = [...source];
     const comments = [];

package/packages/core/dist/draft.d.ts

@@ -1,4 +1,4 @@
-import type { SceneRenderOptions, WorldOrbitAtlasDocument, WorldOrbitAtlasSystem, WorldOrbitDiagnostic, WorldOrbitDocument, WorldOrbitObject } from "./types.js";
+import type { SceneRenderOptions, WorldOrbitAtlasDocument, WorldOrbitEvent, WorldOrbitAtlasSystem, WorldOrbitDiagnostic, WorldOrbitDocument, WorldOrbitObject } from "./types.js";
 interface UpgradeOptions extends Pick<SceneRenderOptions, "preset" | "projection"> {
 }
 export declare function upgradeDocumentToV2(document: WorldOrbitDocument, options?: UpgradeOptions): WorldOrbitAtlasDocument;
@@ -10,9 +10,12 @@ export declare function upgradeDocumentToDraftV2(document: WorldOrbitDocument, o
     system: WorldOrbitAtlasSystem | null;
     groups: import("./types.js").WorldOrbitGroup[];
     relations: import("./types.js").WorldOrbitRelation[];
+    events: WorldOrbitEvent[];
     objects: WorldOrbitObject[];
     diagnostics: WorldOrbitDiagnostic[];
 };
-export declare function materializeAtlasDocument(document: WorldOrbitAtlasDocument): WorldOrbitDocument;
+export declare function materializeAtlasDocument(document: WorldOrbitAtlasDocument, options?: {
+    activeEventId?: string | null;
+}): WorldOrbitDocument;
 export declare function materializeDraftDocument(document: WorldOrbitAtlasDocument): WorldOrbitDocument;
 export {};