worldorbit 3.1.0 → 3.2.0

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

@@ -1,5 +1,5 @@
 import { collectAtlasDiagnostics } from "./atlas-validate.js";
-export function createEmptyAtlasDocument(systemId = "WorldOrbit", version = "2.6.1") {
+export function createEmptyAtlasDocument(systemId = "WorldOrbit", version = "2.6") {
     return {
         format: "worldorbit",
         version,

package/dist/browser/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" || sourceSchemaVersion === "2.6.1") {
+    if (sourceSchemaVersion === "2.1" || sourceSchemaVersion === "2.5" || sourceSchemaVersion === "2.6") {
         if (filter) {
             for (const groupId of filter.groupIds) {
                 if (!groupIds.has(groupId)) {

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

@@ -210,12 +210,12 @@ 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", "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);
+        !["2.0-draft", "2.0", "2.1", "2.5", "2.6"].includes(tokens[1].value.toLowerCase())) {
+        throw new WorldOrbitError('Expected atlas header "schema 2.0", "schema 2.1", "schema 2.5", "schema 2.6", or legacy "schema 2.0-draft"', line, tokens[0]?.column ?? 1);
     }
     const version = tokens[1].value.toLowerCase();
-    return version === "2.6.1"
-        ? "2.6.1"
+    return version === "2.6"
+        ? "2.6"
         : version === "2.5"
             ? "2.5"
             : version === "2.1"
@@ -1566,8 +1566,10 @@ function schemaVersionRank(version) {
             return 2;
         case "2.5":
             return 3;
-        case "2.6.1":
+        case "2.6":
             return 4;
+        default:
+            return 5;
     }
 }
 function preprocessAtlasSource(source) {

package/dist/browser/core/dist/draft.js

@@ -18,8 +18,8 @@ export function upgradeDocumentToV2(document, options = {}) {
     }
     return {
         format: "worldorbit",
-        version: "2.6.1",
-        schemaVersion: "2.6.1",
+        version: "2.6",
+        schemaVersion: "2.6",
         sourceVersion: document.version,
         theme: document.theme ?? null,
         system,

package/dist/browser/core/dist/format.js

@@ -39,18 +39,18 @@ export function formatDocument(document, options = {}) {
     const useDraft = schema === "2.0" ||
         schema === "2.1" ||
         schema === "2.5" ||
-        schema === "2.6.1" ||
+        schema === "2.6" ||
         schema === "2.0-draft" ||
         document.version === "2.0" ||
         document.version === "2.1" ||
         document.version === "2.5" ||
-        document.version === "2.6.1" ||
+        document.version === "2.6" ||
         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.6.1"
+                : document.version === "2.0" || document.version === "2.1" || document.version === "2.5" || document.version === "2.6"
                     ? {
                         ...document,
                         version: "2.0-draft",
@@ -59,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" || document.version === "2.6.1"
+        const atlasDocument = document.version === "2.0" || document.version === "2.1" || document.version === "2.5" || document.version === "2.6"
             ? document
             : document.version === "2.0-draft"
                 ? {
@@ -68,7 +68,7 @@ export function formatDocument(document, options = {}) {
                     schemaVersion: "2.0",
                 }
                 : upgradeDocumentToV2(document);
-        if ((schema === "2.0" || schema === "2.1" || schema === "2.5" || schema === "2.6.1") && atlasDocument.version !== schema) {
+        if ((schema === "2.0" || schema === "2.1" || schema === "2.5" || schema === "2.6") && atlasDocument.version !== schema) {
             return formatAtlasDocument({
                 ...atlasDocument,
                 version: schema,

package/dist/browser/core/dist/load.js

@@ -5,9 +5,10 @@ import { WorldOrbitError } from "./errors.js";
 import { normalizeDocument } from "./normalize.js";
 import { parseWorldOrbit } from "./parse.js";
 import { validateDocument } from "./validate.js";
-const ATLAS_SCHEMA_PATTERN = /^schema\s+2(?:\.0|\.1|\.5)?$/i;
+const ATLAS_SCHEMA_PATTERN = /^schema\s+2(?:\.0|\.1|\.5|\.6)?$/i;
 const ATLAS_SCHEMA_21_PATTERN = /^schema\s+2\.1$/i;
 const ATLAS_SCHEMA_25_PATTERN = /^schema\s+2\.5$/i;
+const ATLAS_SCHEMA_26_PATTERN = /^schema\s+2\.6$/i;
 const LEGACY_DRAFT_SCHEMA_PATTERN = /^schema\s+2\.0-draft$/i;
 export function detectWorldOrbitSchemaVersion(source) {
     for (const line of stripCommentsForSchemaDetection(source).split(/\r?\n/)) {
@@ -22,7 +23,10 @@ export function detectWorldOrbitSchemaVersion(source) {
             return "2.1";
         }
         if (ATLAS_SCHEMA_25_PATTERN.test(trimmed)) {
-            return "2.6.1";
+            return "2.5";
+        }
+        if (ATLAS_SCHEMA_26_PATTERN.test(trimmed)) {
+            return "2.6";
         }
         if (ATLAS_SCHEMA_PATTERN.test(trimmed)) {
             return "2.0";
@@ -88,7 +92,7 @@ export function loadWorldOrbitSourceWithDiagnostics(source) {
         schemaVersion === "2.0-draft" ||
         schemaVersion === "2.1" ||
         schemaVersion === "2.5" ||
-        schemaVersion === "2.6.1") {
+        schemaVersion === "2.6") {
         return loadAtlasSourceWithDiagnostics(source, schemaVersion);
     }
     let ast;

package/dist/browser/core/dist/scene.js

@@ -1064,7 +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.schemaVersion === "2.6" ||
             document.groups.some((group) => group.id === entry)) {
             return entry;
         }

package/dist/browser/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" | "2.6.1";
+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";

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

@@ -1,5 +1,5 @@
 import { collectAtlasDiagnostics } from "./atlas-validate.js";
-export function createEmptyAtlasDocument(systemId = "WorldOrbit", version = "2.6.1") {
+export function createEmptyAtlasDocument(systemId = "WorldOrbit", version = "2.6") {
     return {
         format: "worldorbit",
         version,

package/dist/unpkg/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" || sourceSchemaVersion === "2.6.1") {
+    if (sourceSchemaVersion === "2.1" || sourceSchemaVersion === "2.5" || sourceSchemaVersion === "2.6") {
         if (filter) {
             for (const groupId of filter.groupIds) {
                 if (!groupIds.has(groupId)) {

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

@@ -210,12 +210,12 @@ 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", "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);
+        !["2.0-draft", "2.0", "2.1", "2.5", "2.6"].includes(tokens[1].value.toLowerCase())) {
+        throw new WorldOrbitError('Expected atlas header "schema 2.0", "schema 2.1", "schema 2.5", "schema 2.6", or legacy "schema 2.0-draft"', line, tokens[0]?.column ?? 1);
     }
     const version = tokens[1].value.toLowerCase();
-    return version === "2.6.1"
-        ? "2.6.1"
+    return version === "2.6"
+        ? "2.6"
         : version === "2.5"
             ? "2.5"
             : version === "2.1"
@@ -1566,8 +1566,10 @@ function schemaVersionRank(version) {
             return 2;
         case "2.5":
             return 3;
-        case "2.6.1":
+        case "2.6":
             return 4;
+        default:
+            return 5;
     }
 }
 function preprocessAtlasSource(source) {

package/dist/unpkg/core/dist/draft.js

@@ -18,8 +18,8 @@ export function upgradeDocumentToV2(document, options = {}) {
     }
     return {
         format: "worldorbit",
-        version: "2.6.1",
-        schemaVersion: "2.6.1",
+        version: "2.6",
+        schemaVersion: "2.6",
         sourceVersion: document.version,
         theme: document.theme ?? null,
         system,

package/dist/unpkg/core/dist/format.js

@@ -39,18 +39,18 @@ export function formatDocument(document, options = {}) {
     const useDraft = schema === "2.0" ||
         schema === "2.1" ||
         schema === "2.5" ||
-        schema === "2.6.1" ||
+        schema === "2.6" ||
         schema === "2.0-draft" ||
         document.version === "2.0" ||
         document.version === "2.1" ||
         document.version === "2.5" ||
-        document.version === "2.6.1" ||
+        document.version === "2.6" ||
         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.6.1"
+                : document.version === "2.0" || document.version === "2.1" || document.version === "2.5" || document.version === "2.6"
                     ? {
                         ...document,
                         version: "2.0-draft",
@@ -59,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" || document.version === "2.6.1"
+        const atlasDocument = document.version === "2.0" || document.version === "2.1" || document.version === "2.5" || document.version === "2.6"
             ? document
             : document.version === "2.0-draft"
                 ? {
@@ -68,7 +68,7 @@ export function formatDocument(document, options = {}) {
                     schemaVersion: "2.0",
                 }
                 : upgradeDocumentToV2(document);
-        if ((schema === "2.0" || schema === "2.1" || schema === "2.5" || schema === "2.6.1") && atlasDocument.version !== schema) {
+        if ((schema === "2.0" || schema === "2.1" || schema === "2.5" || schema === "2.6") && atlasDocument.version !== schema) {
             return formatAtlasDocument({
                 ...atlasDocument,
                 version: schema,

package/dist/unpkg/core/dist/load.js

@@ -5,9 +5,10 @@ import { WorldOrbitError } from "./errors.js";
 import { normalizeDocument } from "./normalize.js";
 import { parseWorldOrbit } from "./parse.js";
 import { validateDocument } from "./validate.js";
-const ATLAS_SCHEMA_PATTERN = /^schema\s+2(?:\.0|\.1|\.5)?$/i;
+const ATLAS_SCHEMA_PATTERN = /^schema\s+2(?:\.0|\.1|\.5|\.6)?$/i;
 const ATLAS_SCHEMA_21_PATTERN = /^schema\s+2\.1$/i;
 const ATLAS_SCHEMA_25_PATTERN = /^schema\s+2\.5$/i;
+const ATLAS_SCHEMA_26_PATTERN = /^schema\s+2\.6$/i;
 const LEGACY_DRAFT_SCHEMA_PATTERN = /^schema\s+2\.0-draft$/i;
 export function detectWorldOrbitSchemaVersion(source) {
     for (const line of stripCommentsForSchemaDetection(source).split(/\r?\n/)) {
@@ -22,7 +23,10 @@ export function detectWorldOrbitSchemaVersion(source) {
             return "2.1";
         }
         if (ATLAS_SCHEMA_25_PATTERN.test(trimmed)) {
-            return "2.6.1";
+            return "2.5";
+        }
+        if (ATLAS_SCHEMA_26_PATTERN.test(trimmed)) {
+            return "2.6";
         }
         if (ATLAS_SCHEMA_PATTERN.test(trimmed)) {
             return "2.0";
@@ -88,7 +92,7 @@ export function loadWorldOrbitSourceWithDiagnostics(source) {
         schemaVersion === "2.0-draft" ||
         schemaVersion === "2.1" ||
         schemaVersion === "2.5" ||
-        schemaVersion === "2.6.1") {
+        schemaVersion === "2.6") {
         return loadAtlasSourceWithDiagnostics(source, schemaVersion);
     }
     let ast;

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

@@ -1064,7 +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.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" | "2.6.1";
+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";