worldorbit 3.0.7 → 3.2.0

package/dist/unpkg/core/dist/parse.js

@@ -4,9 +4,14 @@ import { getIndent, tokenizeLineDetailed } from "./tokenize.js";
 export function parseWorldOrbit(source) {
     const lines = source.split(/\r?\n/);
     const objects = [];
+    let themeNode = null;
     let currentObject = null;
     let inInfoBlock = false;
+    let inThemeBlock = false;
     let infoIndent = null;
+    let themeIndent = null;
+    let themeBlockIndent = null;
+    let currentThemeBlock = null;
     for (let index = 0; index < lines.length; index++) {
         const rawLine = lines[index];
         const lineNumber = index + 1;
@@ -23,12 +28,49 @@ export function parseWorldOrbit(source) {
         }
         if (indent === 0) {
             inInfoBlock = false;
+            inThemeBlock = false;
             infoIndent = null;
+            themeIndent = null;
+            themeBlockIndent = null;
+            currentThemeBlock = null;
+            if (tokens.length >= 1 && tokens[0].value === "theme") {
+                inThemeBlock = true;
+                themeIndent = 0;
+                themeNode = {
+                    type: "theme",
+                    preset: tokens.length >= 2 ? tokens[1].value : null,
+                    blocks: [],
+                    location: { line: lineNumber, column: tokens[0].column },
+                };
+                continue;
+            }
             const objectNode = parseObjectHeader(tokens, lineNumber);
             objects.push(objectNode);
             currentObject = objectNode;
             continue;
         }
+        if (inThemeBlock) {
+            if (tokens.length >= 2 && tokens[0].value === "preset" && (!themeBlockIndent || indent <= themeBlockIndent)) {
+                if (themeNode) {
+                    themeNode.preset = tokens[1].value;
+                }
+                continue;
+            }
+            if (currentThemeBlock && themeBlockIndent !== null && indent > themeBlockIndent) {
+                currentThemeBlock.fields.push(parseThemeField(tokens, lineNumber));
+            }
+            else {
+                themeBlockIndent = indent;
+                currentThemeBlock = {
+                    type: "theme-block",
+                    target: tokens[0].value,
+                    fields: [],
+                    location: { line: lineNumber, column: tokens[0].column },
+                };
+                themeNode?.blocks.push(currentThemeBlock);
+            }
+            continue;
+        }
         if (!currentObject) {
             throw new WorldOrbitError("Indented line without parent object", lineNumber, indent + 1);
         }
@@ -49,6 +91,7 @@ export function parseWorldOrbit(source) {
     }
     return {
         type: "document",
+        theme: themeNode,
         objects,
     };
 }
@@ -120,6 +163,17 @@ function parseField(tokens, line) {
         location: { line, column: tokens[0].column },
     };
 }
+function parseThemeField(tokens, line) {
+    if (tokens.length < 2) {
+        throw new WorldOrbitError("Invalid theme field line", line, tokens[0]?.column ?? 1);
+    }
+    return {
+        type: "field",
+        key: tokens[0].value,
+        values: tokens.slice(1).map((token) => token.value),
+        location: { line, column: tokens[0].column },
+    };
+}
 function parseInfoEntry(tokens, line) {
     if (tokens.length < 2) {
         throw new WorldOrbitError("Invalid info entry", line, tokens[0]?.column ?? 1);

package/dist/unpkg/core/dist/scene.js

@@ -1064,6 +1064,7 @@ function parseViewpointGroups(value, document, relationships, objectMap) {
     return splitListValue(value).map((entry) => {
         if (document.schemaVersion === "2.1" ||
             document.schemaVersion === "2.5" ||
+            document.schemaVersion === "2.6" ||
             document.groups.some((group) => group.id === entry)) {
             return entry;
         }

package/dist/unpkg/core/dist/types.d.ts

@@ -2,7 +2,7 @@ export type WorldOrbitObjectType = "system" | "star" | "planet" | "moon" | "belt
 export type PlacementMode = "orbit" | "at" | "surface" | "free";
 export type Unit = "au" | "km" | "m" | "ly" | "pc" | "kpc" | "re" | "rj" | "sol" | "me" | "mj" | "s" | "min" | "h" | "d" | "y" | "ky" | "my" | "gy" | "K" | "deg";
 export type WorldOrbitDocumentVersion = "1.0";
-export type WorldOrbitAtlasDocumentVersion = "2.0" | "2.1" | "2.5";
+export type WorldOrbitAtlasDocumentVersion = "2.0" | "2.1" | "2.5" | "2.6";
 export type WorldOrbitDraftDocumentVersion = "2.0-draft";
 export type WorldOrbitAnyDocumentVersion = WorldOrbitDocumentVersion | WorldOrbitAtlasDocumentVersion | WorldOrbitDraftDocumentVersion;
 export type ViewProjection = "topdown" | "isometric" | "orthographic" | "perspective";
@@ -34,8 +34,21 @@ export interface TokenizeOptions {
     line?: number;
     columnOffset?: number;
 }
+export interface AstThemeNode {
+    type: "theme";
+    preset: string | null;
+    blocks: AstThemeBlockNode[];
+    location: AstSourceLocation;
+}
+export interface AstThemeBlockNode {
+    type: "theme-block";
+    target: string;
+    fields: AstFieldNode[];
+    location: AstSourceLocation;
+}
 export interface AstDocument {
     type: "document";
+    theme: AstThemeNode | null;
     objects: AstObjectNode[];
 }
 export interface AstObjectNode {
@@ -59,10 +72,15 @@ export interface AstInfoEntryNode {
     value: string;
     location: AstSourceLocation;
 }
+export interface NormalizedTheme {
+    preset: string | null;
+    styles: Record<string, Record<string, NormalizedValue>>;
+}
 export interface WorldOrbitDocument {
     format: "worldorbit";
     version: WorldOrbitDocumentVersion;
     schemaVersion: WorldOrbitAnyDocumentVersion;
+    theme: NormalizedTheme | null;
     system: WorldOrbitSystem | null;
     groups: WorldOrbitGroup[];
     relations: WorldOrbitRelation[];
@@ -74,6 +92,7 @@ export interface WorldOrbitAtlasDocument {
     version: WorldOrbitAtlasDocumentVersion;
     schemaVersion: WorldOrbitAtlasDocumentVersion;
     sourceVersion: WorldOrbitDocumentVersion;
+    theme: NormalizedTheme | null;
     system: WorldOrbitAtlasSystem | null;
     groups: WorldOrbitGroup[];
     relations: WorldOrbitRelation[];
@@ -86,6 +105,7 @@ export interface WorldOrbitDraftDocument {
     version: WorldOrbitDraftDocumentVersion;
     schemaVersion: WorldOrbitDraftDocumentVersion;
     sourceVersion: WorldOrbitDocumentVersion;
+    theme: NormalizedTheme | null;
     system: WorldOrbitAtlasSystem | null;
     groups: WorldOrbitGroup[];
     relations: WorldOrbitRelation[];