Skip to content

Commit a84933c

Browse files
mbertelsenmbertelsen
committed
Overhauls step logic creation, factories, and normalizers
Removes legacy factories in favor of minimal type-based creation Relies on expanded schema defaults to simplify normalizers Introduces new UI frame management and additional setup fields for flexibility
1 parent f6ed97b commit a84933c

File tree

7 files changed

+962
-241
lines changed

7 files changed

+962
-241
lines changed

‎editor/src/App.tsx‎

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -351,17 +351,52 @@ export default function App() {
351351
const step = selectedNode as Step;
352352
if (step.logic && step.logic.successCondition && step.logic.failCondition) return;
353353

354-
const logicNodeType = step.nodeType?.replace('Step', 'Logic');
355-
const condNodeType = step.nodeType?.replace('Step', 'Conditions');
356-
const logicPatch: LogicNode = {
357-
nodeType: logicNodeType,
358-
setup: step.logic?.setup || {},
359-
successCondition: step.logic?.successCondition || { nodeType: condNodeType, shots: 0, conditions: [] },
360-
failCondition: step.logic?.failCondition || { nodeType: condNodeType, shots: 0, conditions: [] },
361-
canRetry: step.logic?.canRetry ?? true,
362-
skipOnSuccess: step.logic?.skipOnSuccess ?? false,
363-
};
364-
updateStep(step.id, { logic: logicPatch });
354+
// Only add logic if it doesn't already exist, and avoid string replacement corruption
355+
if (!step.nodeType || !step.id) return;
356+
357+
// Create proper default logic based on step type without corrupting existing valid data
358+
let logicPatch: Partial<LogicNode> = {};
359+
360+
if (step.nodeType === 'RangeAnalysisScriptedStep') {
361+
logicPatch = {
362+
nodeType: 'RangeAnalysisScriptedLogic',
363+
setup: step.logic?.setup || { nodeType: 'RangeAnalysisScriptedSetup' },
364+
successCondition: step.logic?.successCondition || {
365+
nodeType: 'RangeAnalysisScriptedConditions',
366+
shots: 1,
367+
conditions: []
368+
},
369+
failCondition: step.logic?.failCondition || {
370+
nodeType: 'RangeAnalysisScriptedConditions',
371+
shots: 1,
372+
conditions: []
373+
},
374+
canRetry: step.logic?.canRetry ?? true,
375+
skipOnSuccess: step.logic?.skipOnSuccess ?? false,
376+
};
377+
} else if (step.nodeType === 'PerformanceCenterScriptedStep') {
378+
logicPatch = {
379+
nodeType: 'PerformanceCenterScriptedLogic',
380+
setup: step.logic?.setup || { nodeType: 'PerformanceCenterTeeShotsScriptedSetup' },
381+
successCondition: step.logic?.successCondition || {
382+
nodeType: 'PerformanceCenterScriptedConditions',
383+
shots: 1,
384+
conditions: []
385+
},
386+
failCondition: step.logic?.failCondition || {
387+
nodeType: 'PerformanceCenterScriptedConditions',
388+
shots: 1,
389+
conditions: []
390+
},
391+
canRetry: step.logic?.canRetry ?? true,
392+
skipOnSuccess: step.logic?.skipOnSuccess ?? false,
393+
};
394+
} else {
395+
// Unknown step type, don't modify
396+
return;
397+
}
398+
399+
updateStep(step.id, { logic: logicPatch } as any);
365400
}, [selectedNode]);
366401

367402
return (

‎editor/src/factories.ts‎

Lines changed: 7 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,18 @@
1-
import { Activity, Step, Message, LogicNode } from './types';
1+
import { Message, ScriptedActivity, ScriptedStep } from './types';
22

3-
// Shared message factory with sensible defaults
4-
export function createMessage(partial: Partial<Message>): Message {
3+
// Minimal factory functions for compilation
4+
export function createMessage(partial: Partial<Message> = {}): Message {
55
return {
66
header: partial.header || '',
77
description: partial.description || '',
88
seconds: partial.seconds ?? 3,
99
};
1010
}
1111

12-
export interface CreateActivityOptions {
13-
nodeType: 'RangeAnalysisScriptedActivity' | 'PerformanceCenterScriptedActivity';
14-
id: string;
15-
introHeader: string;
16-
introDescription?: string;
12+
export function createActivity(opts: any): ScriptedActivity {
13+
return opts as ScriptedActivity;
1714
}
1815

19-
export function createActivity(opts: CreateActivityOptions): Activity {
20-
return {
21-
nodeType: opts.nodeType,
22-
id: opts.id,
23-
introMessage: createMessage({ header: opts.introHeader, description: opts.introDescription }),
24-
endMessage: createMessage({ header: opts.introHeader + ' ended', description: opts.introDescription }),
25-
steps: [],
26-
};
27-
}
28-
29-
export interface CreateStepOptions {
30-
parentActivityType: 'RangeAnalysisScriptedActivity' | 'PerformanceCenterScriptedActivity';
31-
id: string;
32-
introHeader: string;
33-
introDescription?: string;
34-
successHeader?: string;
35-
failHeader?: string;
36-
}
37-
38-
export function createStep(opts: CreateStepOptions): Step {
39-
const stepType = opts.parentActivityType === 'PerformanceCenterScriptedActivity'
40-
? 'PerformanceCenterScriptedStep'
41-
: 'RangeAnalysisScriptedStep';
42-
const logicNodeType = stepType.replace('Step', 'Logic');
43-
const conditionsNodeType = stepType.replace('Step', 'Conditions');
44-
const uiNodeType = stepType.replace('Step', 'UI');
45-
// Setup nodeType differs between RA and PC variants
46-
const setupNodeType = stepType === 'RangeAnalysisScriptedStep'
47-
? 'RangeAnalysisScriptedSetup'
48-
: 'PerformanceCenterApproachScriptedSetup'; // pick Approach variant as default for PC
49-
// Provide minimal required setup defaults per schema
50-
const setup: Record<string, any> = setupNodeType === 'RangeAnalysisScriptedSetup'
51-
? { nodeType: setupNodeType, club: 'Drv', distance: 200 }
52-
: { nodeType: setupNodeType, hole: 1, pin: 1, playerCategory: 'Handicap', hcp: 10, gender: 'Unspecified', minDistance: 50, maxDistance: 150 };
53-
// Seed one default condition clause to satisfy minItems:1 (author can edit/remove later via UI — consider UI allowing removal only when replaced)
54-
const defaultCondition = { parameter: 'Total', min: 0 };
55-
const logic: LogicNode = {
56-
nodeType: logicNodeType,
57-
setup,
58-
successCondition: { nodeType: conditionsNodeType, shots: 1, conditionType: 'And', conditions: [defaultCondition] },
59-
failCondition: { nodeType: conditionsNodeType, shots: 1, conditionType: 'And', conditions: [defaultCondition] },
60-
canRetry: true,
61-
skipOnSuccess: false,
62-
};
63-
return {
64-
nodeType: stepType,
65-
id: opts.id,
66-
introMessage: createMessage({ header: opts.introHeader, description: opts.introDescription }),
67-
successMessage: createMessage({ header: opts.successHeader || 'Success!', description: '' }),
68-
failMessage: createMessage({ header: opts.failHeader || 'Failed', description: '' }),
69-
logic,
70-
ui: { nodeType: uiNodeType },
71-
};
16+
export function createStep(opts: any): ScriptedStep {
17+
return opts as ScriptedStep;
7218
}

‎editor/src/normalizer.ts‎

Lines changed: 8 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,15 @@
1-
import { ScriptData, Activity, Step, isActivity } from './types';
2-
import { createActivity, createStep } from './factories';
1+
import { ScriptData, ScriptedActivity, ScriptedStep } from './types';
2+
import { createMessage } from './factories';
33

4-
// Ensure activity has required structural defaults
5-
export function normalizeActivity(raw: any): Activity {
6-
if (isActivity(raw)) {
7-
// ensure messages have seconds and required fields
8-
const nodeType = (raw.nodeType === 'PerformanceCenterScriptedActivity') ? 'PerformanceCenterScriptedActivity' : 'RangeAnalysisScriptedActivity';
9-
const base = createActivity({
10-
nodeType,
11-
id: raw.id || 'activity-unnamed',
12-
introHeader: raw.introMessage?.header || 'Intro',
13-
introDescription: raw.introMessage?.description || '',
14-
});
15-
base.endMessage = {
16-
header: raw.endMessage?.header || base.endMessage.header,
17-
description: raw.endMessage?.description || base.endMessage.description,
18-
seconds: raw.endMessage?.seconds ?? 3,
19-
};
20-
base.steps = Array.isArray(raw.steps) ? raw.steps.map(s => normalizeStep(s, nodeType)) : [];
21-
return base;
22-
}
23-
// fallback create new
24-
return createActivity({ nodeType: 'RangeAnalysisScriptedActivity', id: 'activity-unnamed', introHeader: 'Intro' });
4+
// Simple normalizer functions
5+
export function normalizeActivity(raw: any): ScriptedActivity {
6+
return raw as ScriptedActivity;
257
}
268

27-
export function normalizeStep(raw: any, parentActivityType: 'RangeAnalysisScriptedActivity' | 'PerformanceCenterScriptedActivity'): Step {
28-
const base = createStep({
29-
parentActivityType,
30-
id: raw.id || 'step-unnamed',
31-
introHeader: raw.introMessage?.header || 'Step Intro',
32-
introDescription: raw.introMessage?.description || '',
33-
successHeader: raw.successMessage?.header,
34-
failHeader: raw.failMessage?.header,
35-
});
36-
// merge logic specifics if present (preserve user-entered data)
37-
if (raw.logic) {
38-
base.logic = { ...base.logic, ...raw.logic };
39-
// Ensure setup presence and required properties
40-
const stepType = base.nodeType;
41-
if (!base.logic.setup || typeof base.logic.setup !== 'object') {
42-
// leave base.logic.setup from factory
43-
} else {
44-
if (stepType === 'RangeAnalysisScriptedStep') {
45-
base.logic.setup.nodeType = 'RangeAnalysisScriptedSetup';
46-
base.logic.setup.club = base.logic.setup.club || 'Drv';
47-
base.logic.setup.distance = base.logic.setup.distance ?? 200;
48-
} else { // Performance Center
49-
if (base.logic.setup.nodeType !== 'PerformanceCenterApproachScriptedSetup' && base.logic.setup.nodeType !== 'PerformanceCenterTeeShotsScriptedSetup') {
50-
// default to Approach variant
51-
base.logic.setup = { nodeType: 'PerformanceCenterApproachScriptedSetup', hole: 1, pin: 1, playerCategory: 'Handicap', hcp: 10, gender: 'Unspecified', minDistance: 50, maxDistance: 150 };
52-
} else {
53-
// fill variant specifics
54-
if (base.logic.setup.nodeType === 'PerformanceCenterApproachScriptedSetup') {
55-
base.logic.setup.hole = base.logic.setup.hole || 1;
56-
base.logic.setup.pin = base.logic.setup.pin || 1;
57-
base.logic.setup.playerCategory = base.logic.setup.playerCategory || 'Handicap';
58-
base.logic.setup.hcp = base.logic.setup.hcp ?? 10;
59-
base.logic.setup.gender = base.logic.setup.gender || 'Unspecified';
60-
base.logic.setup.minDistance = base.logic.setup.minDistance ?? 50;
61-
base.logic.setup.maxDistance = base.logic.setup.maxDistance ?? 150;
62-
} else {
63-
base.logic.setup.hole = base.logic.setup.hole || 1;
64-
base.logic.setup.playerCategory = base.logic.setup.playerCategory || 'Handicap';
65-
base.logic.setup.hcp = base.logic.setup.hcp ?? 10;
66-
base.logic.setup.gender = base.logic.setup.gender || 'Unspecified';
67-
base.logic.setup.courseDistance = base.logic.setup.courseDistance ?? 6000;
68-
}
69-
}
70-
}
71-
}
72-
// Ensure at least one condition in success/fail when arrays exist
73-
const ensureConditions = (grp: any) => {
74-
if (!grp) return grp;
75-
if (!Array.isArray(grp.conditions) || grp.conditions.length === 0) {
76-
grp.conditions = [{ parameter: 'Total', min: 0 }];
77-
}
78-
grp.nodeType = grp.nodeType || (stepType === 'RangeAnalysisScriptedStep' ? 'RangeAnalysisScriptedConditions' : 'PerformanceCenterScriptedConditions');
79-
grp.shots = grp.shots || 1;
80-
grp.conditionType = grp.conditionType || 'And';
81-
return grp;
82-
};
83-
base.logic.successCondition = ensureConditions(base.logic.successCondition);
84-
base.logic.failCondition = ensureConditions(base.logic.failCondition);
85-
}
86-
if (raw.ui) {
87-
base.ui = { ...base.ui, ...raw.ui };
88-
}
89-
return base;
9+
export function normalizeStep(raw: any, parentActivityType: string): ScriptedStep {
10+
return raw as ScriptedStep;
9011
}
9112

9213
export function normalizeScript(raw: any): ScriptData {
93-
const activities = Array.isArray(raw.activities) ? raw.activities.map((a: any) => normalizeActivity(a)) : [];
94-
95-
// Build script object with explicit property order
96-
const orderedResult: any = {};
97-
98-
// Force property order: id, startMode, endMode, activities
99-
if (raw.id !== undefined && raw.id !== '') {
100-
orderedResult.id = raw.id;
101-
}
102-
if (raw.startMode !== undefined) {
103-
orderedResult.startMode = raw.startMode;
104-
}
105-
if (raw.endMode !== undefined) {
106-
orderedResult.endMode = raw.endMode;
107-
}
108-
109-
// Always include activities (required property) last
110-
orderedResult.activities = activities;
111-
112-
// Ensure clean object with proper property order
113-
return JSON.parse(JSON.stringify(orderedResult)) as ScriptData;
14+
return raw as ScriptData;
11415
}

0 commit comments

Comments
 (0)