Ensures consistent property ordering

Maintains a predictable structure for script objects by rebuilding them in a fixed order.
clarifies merging logic for updates and adds an example script for verification.

Author: mbertelsen

editor/src/App.tsx

@@ -318,9 +318,29 @@ export default function App() {
     dispatch({ type: 'UPDATE_STEP', stepId, patch });
   };
 
-  // Helper to update the script data
+  // Helper to update the script data while preserving property order
   const updateScript = (patch: Partial<ScriptData>) => {
-    dispatch({ type: 'LOAD_SCRIPT', script: { ...script, ...patch } });
+    // Merge patch into current script first
+    const merged = { ...script, ...patch };
+    
+    // Always reconstruct the script object in the desired property order
+    const orderedScript: any = {};
+    
+    // Add properties in the desired order: id, startMode, endMode, activities
+    if (merged.id !== undefined && merged.id !== '') {
+      orderedScript.id = merged.id;
+    }
+    if (merged.startMode !== undefined) {
+      orderedScript.startMode = merged.startMode;
+    }
+    if (merged.endMode !== undefined) {
+      orderedScript.endMode = merged.endMode;
+    }
+    
+    // Always include activities (required property) last
+    orderedScript.activities = merged.activities;
+    
+    dispatch({ type: 'LOAD_SCRIPT', script: orderedScript as ScriptData });
   };
 
   // Ensure step logic is properly initialized when a step is selected
@@ -398,6 +418,7 @@ export default function App() {
                 script={script}
                 onChange={updateScript}
               />
+              <pre>{JSON.stringify(script, null, 2)}</pre>
             </div>
           ) : (
             <NodeDetailsPanel

editor/src/normalizer.ts

@@ -91,5 +91,25 @@ export function normalizeStep(raw: any, parentActivityType: 'RangeAnalysisScript
 
 export function normalizeScript(raw: any): ScriptData {
   const activities = Array.isArray(raw.activities) ? raw.activities.map((a: any) => normalizeActivity(a)) : [];
-  return { activities };
+  
+  // Preserve root-level properties in proper order: id, startMode, endMode, activities
+  const result: ScriptData = { activities };
+  
+  // Add properties in desired order by reconstructing the object
+  const orderedResult: ScriptData = { activities: [] };
+  
+  if (raw.id !== undefined) {
+    orderedResult.id = raw.id;
+  }
+  if (raw.startMode !== undefined) {
+    orderedResult.startMode = raw.startMode;
+  }
+  if (raw.endMode !== undefined) {
+    orderedResult.endMode = raw.endMode;
+  }
+  
+  // Always include activities last (required property)
+  orderedResult.activities = activities;
+  
+  return orderedResult;
 }

examples/test-order.json

@@ -0,0 +1,55 @@
+{
+  "$schema": "../schema/1.0.0/app-scripting.schema.json",
+  "id": "test-script-1",
+  "startMode": "Overwrite",
+  "endMode": "Wait",
+  "activities": [
+    {
+      "nodeType": "RangeAnalysisScriptedActivity",
+      "id": "ra-1",
+      "introMessage": { "header": "Test Activity", "description": "Testing property order", "seconds": 3 },
+      "endMessage": { "header": "Done", "description": "", "seconds": 3 },
+      "steps": [
+        {
+          "nodeType": "RangeAnalysisScriptedStep",
+          "id": "ra-step-1",
+          "introMessage": {
+            "header": "Hit 3 shots",
+            "description": "",
+            "seconds": 5
+          },
+          "successMessage": {
+            "header": "Great!",
+            "description": "",
+            "seconds": 3
+          },
+          "failMessage": {
+            "header": "Try again",
+            "description": "",
+            "seconds": 3
+          },
+          "logic": {
+            "nodeType": "RangeAnalysisScriptedLogic",
+            "setup": {
+              "nodeType": "RangeAnalysisScriptedSetup",
+              "club": "Drv",
+              "distance": 200
+            },
+            "successCondition": {
+              "nodeType": "RangeAnalysisScriptedConditions",
+              "shots": 3,
+              "conditions": [{ "parameter": "Total", "min": 200 }]
+            },
+            "failCondition": {
+              "nodeType": "RangeAnalysisScriptedConditions",
+              "shots": 5
+            },
+            "canRetry": true,
+            "skipOnSuccess": true
+          },
+          "ui": { "nodeType": "RangeAnalysisScriptedUI" }
+        }
+      ]
+    }
+  ]
+}