worldorbit 3.0.6 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "worldorbit",
-  "version": "3.0.6",
+  "version": "3.1.0",
   "description": "A text-based DSL and parser pipeline for orbital worldbuilding",
   "type": "module",
   "main": "./dist/unpkg/worldorbit.esm.js",

package/packages/core/dist/atlas-edit.js

@@ -1,10 +1,14 @@
 import { collectAtlasDiagnostics } from "./atlas-validate.js";
-export function createEmptyAtlasDocument(systemId = "WorldOrbit", version = "2.5") {
+export function createEmptyAtlasDocument(systemId = "WorldOrbit", version = "2.6.1") {
     return {
         format: "worldorbit",
         version,
         schemaVersion: version,
         sourceVersion: "1.0",
+        theme: {
+            preset: "blueprint",
+            styles: {},
+        },
         system: {
             type: "system",
             id: systemId,

package/packages/core/dist/atlas-validate.js

@@ -67,7 +67,7 @@ function validateRelation(relation, objectMap, diagnostics) {
 }
 function validateViewpoint(viewpoint, groupIds, eventIds, sourceSchemaVersion, diagnostics, objectMap) {
     const filter = viewpoint.filter;
-    if (sourceSchemaVersion === "2.1" || sourceSchemaVersion === "2.5") {
+    if (sourceSchemaVersion === "2.1" || sourceSchemaVersion === "2.5" || sourceSchemaVersion === "2.6.1") {
         if (filter) {
             for (const groupId of filter.groupIds) {
                 if (!groupIds.has(groupId)) {

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

@@ -174,6 +174,7 @@ function parseAtlasSource(source, forcedOutputVersion) {
     const baseDocument = {
         format: "worldorbit",
         sourceVersion: "1.0",
+        theme: null,
         system,
         groups,
         relations,
@@ -209,17 +210,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", "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);
+        !["2.0-draft", "2.0", "2.1", "2.5", "2.6.1"].includes(tokens[1].value.toLowerCase())) {
+        throw new WorldOrbitError('Expected atlas header "schema 2.0", "schema 2.1", "schema 2.5", "schema 2.6.1", or legacy "schema 2.0-draft"', line, tokens[0]?.column ?? 1);
     }
     const version = tokens[1].value.toLowerCase();
-    return version === "2.5"
-        ? "2.5"
-        : version === "2.1"
-            ? "2.1"
-            : version === "2.0-draft"
-                ? "2.0-draft"
-                : "2.0";
+    return version === "2.6.1"
+        ? "2.6.1"
+        : 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, events, eventPoseNodes, viewpointIds, annotationIds, groupIds, relationIds, eventIds, flags) {
     const keyword = tokens[0]?.value.toLowerCase();
@@ -1563,6 +1566,8 @@ function schemaVersionRank(version) {
             return 2;
         case "2.5":
             return 3;
+        case "2.6.1":
+            return 4;
     }
 }
 function preprocessAtlasSource(source) {

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

@@ -7,6 +7,7 @@ export declare function upgradeDocumentToDraftV2(document: WorldOrbitDocument, o
     schemaVersion: "2.0-draft";
     format: "worldorbit";
     sourceVersion: import("./types.js").WorldOrbitDocumentVersion;
+    theme: import("./types.js").NormalizedTheme | null;
     system: WorldOrbitAtlasSystem | null;
     groups: import("./types.js").WorldOrbitGroup[];
     relations: import("./types.js").WorldOrbitRelation[];

package/packages/core/dist/draft.js

@@ -18,9 +18,10 @@ export function upgradeDocumentToV2(document, options = {}) {
     }
     return {
         format: "worldorbit",
-        version: "2.5",
-        schemaVersion: "2.5",
+        version: "2.6.1",
+        schemaVersion: "2.6.1",
         sourceVersion: document.version,
+        theme: document.theme ?? null,
         system,
         groups: structuredClone(document.groups ?? []),
         relations: structuredClone(document.relations ?? []),
@@ -51,6 +52,7 @@ export function materializeAtlasDocument(document, options = {}) {
         format: "worldorbit",
         version: "1.0",
         schemaVersion: document.version,
+        theme: document.theme ?? null,
         system,
         groups: structuredClone(document.groups ?? []),
         relations: structuredClone(document.relations ?? []),

package/packages/core/dist/format.js

@@ -39,16 +39,18 @@ export function formatDocument(document, options = {}) {
     const useDraft = schema === "2.0" ||
         schema === "2.1" ||
         schema === "2.5" ||
+        schema === "2.6.1" ||
         schema === "2.0-draft" ||
         document.version === "2.0" ||
         document.version === "2.1" ||
         document.version === "2.5" ||
+        document.version === "2.6.1" ||
         document.version === "2.0-draft";
     if (useDraft) {
         if (schema === "2.0-draft") {
             const legacyDraftDocument = document.version === "2.0-draft"
                 ? document
-                : document.version === "2.0" || document.version === "2.1" || document.version === "2.5"
+                : document.version === "2.0" || document.version === "2.1" || document.version === "2.5" || document.version === "2.6.1"
                     ? {
                         ...document,
                         version: "2.0-draft",
@@ -57,7 +59,7 @@ export function formatDocument(document, options = {}) {
                     : upgradeDocumentToDraftV2(document);
             return formatDraftDocument(legacyDraftDocument);
         }
-        const atlasDocument = document.version === "2.0" || document.version === "2.1" || document.version === "2.5"
+        const atlasDocument = document.version === "2.0" || document.version === "2.1" || document.version === "2.5" || document.version === "2.6.1"
             ? document
             : document.version === "2.0-draft"
                 ? {
@@ -66,7 +68,7 @@ export function formatDocument(document, options = {}) {
                     schemaVersion: "2.0",
                 }
                 : upgradeDocumentToV2(document);
-        if ((schema === "2.0" || schema === "2.1" || schema === "2.5") && atlasDocument.version !== schema) {
+        if ((schema === "2.0" || schema === "2.1" || schema === "2.5" || schema === "2.6.1") && atlasDocument.version !== schema) {
             return formatAtlasDocument({
                 ...atlasDocument,
                 version: schema,

package/packages/core/dist/load.js

@@ -22,7 +22,7 @@ export function detectWorldOrbitSchemaVersion(source) {
             return "2.1";
         }
         if (ATLAS_SCHEMA_25_PATTERN.test(trimmed)) {
-            return "2.5";
+            return "2.6.1";
         }
         if (ATLAS_SCHEMA_PATTERN.test(trimmed)) {
             return "2.0";
@@ -87,7 +87,8 @@ export function loadWorldOrbitSourceWithDiagnostics(source) {
     if (schemaVersion === "2.0" ||
         schemaVersion === "2.0-draft" ||
         schemaVersion === "2.1" ||
-        schemaVersion === "2.5") {
+        schemaVersion === "2.5" ||
+        schemaVersion === "2.6.1") {
         return loadAtlasSourceWithDiagnostics(source, schemaVersion);
     }
     let ast;

package/packages/core/dist/normalize.js

@@ -11,6 +11,7 @@ const URL_SCHEME_PATTERN = /^[A-Za-z][A-Za-z0-9+.-]*:/;
 export function normalizeDocument(ast) {
     let system = null;
     const objects = [];
+    const theme = ast.theme ? normalizeTheme(ast.theme) : null;
     for (const node of ast.objects) {
         const normalized = normalizeObject(node);
         if (node.objectType === "system") {
@@ -27,6 +28,7 @@ export function normalizeDocument(ast) {
         format: "worldorbit",
         version: "1.0",
         schemaVersion: "1.0",
+        theme,
         system,
         groups: [],
         relations: [],
@@ -34,6 +36,40 @@ export function normalizeDocument(ast) {
         objects,
     };
 }
+function normalizeTheme(node) {
+    const styles = {};
+    for (const block of node.blocks) {
+        const fieldMap = collectFields(block.fields);
+        styles[block.target] = normalizeThemeProperties(fieldMap);
+    }
+    return {
+        preset: node.preset,
+        styles,
+    };
+}
+function normalizeThemeProperties(fieldMap) {
+    const result = {};
+    for (const [key, field] of fieldMap.entries()) {
+        if (field.values.length === 1) {
+            const rawValue = field.values[0];
+            if (rawValue === "true") {
+                result[key] = true;
+                continue;
+            }
+            if (rawValue === "false") {
+                result[key] = false;
+                continue;
+            }
+            const num = Number(rawValue);
+            if (!Number.isNaN(num) && rawValue.trim() !== "") {
+                result[key] = num;
+                continue;
+            }
+        }
+        result[key] = field.values.join(" ");
+    }
+    return result;
+}
 function normalizeObject(node) {
     const mergedFields = [...node.inlineFields, ...node.blockFields];
     validateFieldCompatibility(node.objectType, mergedFields);

package/packages/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/packages/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.1" ||
             document.groups.some((group) => group.id === entry)) {
             return entry;
         }

package/packages/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.1";
 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[];