@selvajs/ui 4.2.0 → 4.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/compute/AppLayout.svelte +1 -1
- package/dist/components/compute/AppLayout.svelte.d.ts +1 -1
- package/dist/components/compute/ComputeApp.svelte +54 -133
- package/dist/components/compute/ComputeApp.svelte.d.ts +2 -9
- package/dist/components/compute/ComputeMessagesDialog.svelte +125 -0
- package/dist/components/compute/ComputeMessagesDialog.svelte.d.ts +10 -0
- package/dist/components/compute/ParameterPresetManager.svelte +25 -33
- package/dist/components/layout/PageFooter.svelte +22 -144
- package/dist/components/preview/Group.svelte +6 -3
- package/dist/components/preview/ImageOutput.svelte +1 -13
- package/dist/components/preview/InputControl.svelte +96 -72
- package/dist/components/preview/OutputDisplay.svelte +6 -6
- package/dist/components/preview/TabLayout.svelte +6 -5
- package/dist/components/preview/inputs/FileInput.svelte +10 -19
- package/dist/composables/useFooterItem.svelte.d.ts +10 -12
- package/dist/composables/useFooterItem.svelte.js +9 -16
- package/dist/compute/computeThrottle.svelte.js +5 -2
- package/dist/compute/createSolveSession.svelte.d.ts +56 -0
- package/dist/compute/createSolveSession.svelte.js +122 -0
- package/dist/compute/solve-session-core.d.ts +45 -0
- package/dist/compute/solve-session-core.js +69 -0
- package/dist/constants.d.ts +0 -2
- package/dist/constants.js +0 -2
- package/dist/contexts/clientSlotContext.svelte.d.ts +13 -0
- package/dist/contexts/clientSlotContext.svelte.js +8 -0
- package/dist/contexts/footerContext.svelte.d.ts +17 -5
- package/dist/contexts/footerContext.svelte.js +10 -2
- package/dist/external/storage.js +7 -23
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -0
- package/dist/schema/param-exporter.d.ts +25 -1
- package/dist/schema/param-exporter.js +30 -27
- package/dist/schema/traversal.d.ts +1 -0
- package/dist/schema/traversal.js +5 -0
- package/dist/schema/visibility-rules.d.ts +12 -0
- package/dist/schema/visibility-rules.js +20 -0
- package/dist/types/solveFn.d.ts +1 -2
- package/dist/utils/file-download.d.ts +5 -17
- package/dist/utils/file-download.js +12 -19
- package/dist/utils/randomId.js +3 -19
- package/package.json +10 -26
- package/src/lib/components/compute/AppLayout.svelte +1 -1
- package/src/lib/components/compute/ComputeApp.svelte +54 -133
- package/src/lib/components/compute/ComputeMessagesDialog.svelte +125 -0
- package/src/lib/components/compute/ParameterPresetManager.svelte +25 -33
- package/src/lib/components/layout/PageFooter.svelte +22 -144
- package/src/lib/components/preview/Group.svelte +6 -3
- package/src/lib/components/preview/ImageOutput.svelte +1 -13
- package/src/lib/components/preview/InputControl.svelte +96 -72
- package/src/lib/components/preview/OutputDisplay.svelte +6 -6
- package/src/lib/components/preview/TabLayout.svelte +6 -5
- package/src/lib/components/preview/inputs/FileInput.svelte +10 -19
- package/src/lib/composables/useFooterItem.svelte.ts +25 -25
- package/src/lib/compute/computeThrottle.svelte.ts +5 -2
- package/src/lib/compute/computeThrottle.test.ts +106 -0
- package/src/lib/compute/createSolveSession.svelte.ts +188 -0
- package/src/lib/compute/solve-session-core.test.ts +153 -0
- package/src/lib/compute/solve-session-core.ts +102 -0
- package/src/lib/constants.ts +0 -2
- package/src/lib/contexts/clientSlotContext.svelte.ts +33 -0
- package/src/lib/contexts/footerContext.svelte.ts +29 -14
- package/src/lib/external/storage.test.ts +99 -0
- package/src/lib/external/storage.ts +6 -22
- package/src/lib/index.ts +2 -0
- package/src/lib/schema/param-exporter.test.ts +136 -0
- package/src/lib/schema/param-exporter.ts +44 -30
- package/src/lib/schema/traversal.test.ts +92 -0
- package/src/lib/schema/traversal.ts +5 -0
- package/src/lib/schema/visibility-rules.test.ts +173 -0
- package/src/lib/schema/visibility-rules.ts +25 -0
- package/src/lib/types/solveFn.ts +1 -1
- package/src/lib/utils/file-download.ts +13 -20
- package/src/lib/utils/randomId.ts +3 -19
- package/dist/components/compute/ComputeMessages.svelte +0 -169
- package/dist/components/compute/ComputeMessages.svelte.d.ts +0 -7
- package/dist/components/compute/index.d.ts +0 -5
- package/dist/components/compute/index.js +0 -5
- package/dist/components/preview/index.d.ts +0 -3
- package/dist/components/preview/index.js +0 -4
- package/dist/components/viewer/index.d.ts +0 -3
- package/dist/components/viewer/index.js +0 -3
- package/src/lib/components/compute/ComputeMessages.svelte +0 -169
- package/src/lib/components/compute/index.ts +0 -5
- package/src/lib/components/preview/index.ts +0 -4
- package/src/lib/components/viewer/index.ts +0 -3
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import { getGroups, getLayoutItems, getInputItems } from '@selvajs/schemas';
|
|
3
|
+
import type { UISchema } from '@selvajs/schemas';
|
|
4
|
+
|
|
5
|
+
// These pin the layout-union discrimination (tabbed vs flat) and the defensive contract
|
|
6
|
+
// (missing layout / groups / items yield empty, never throw), since this module is the
|
|
7
|
+
// single place every caller relies on to walk a schema.
|
|
8
|
+
|
|
9
|
+
const input = (id: string, source?: { kind: string }) =>
|
|
10
|
+
({ type: 'input', paramId: id, displayName: id, ...(source ? { source } : {}) }) as never;
|
|
11
|
+
const linebreak = (id: string) => ({ type: 'linebreak', id }) as never;
|
|
12
|
+
const group = (id: string, items: unknown[]) => ({ id, label: id, items }) as never;
|
|
13
|
+
|
|
14
|
+
function schema(layout: unknown): UISchema {
|
|
15
|
+
return { layout } as unknown as UISchema;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
describe('getGroups — layout discrimination', () => {
|
|
19
|
+
it('flattens tabs into a single group list, tab order preserved', () => {
|
|
20
|
+
const s = schema({
|
|
21
|
+
type: 'tabbed',
|
|
22
|
+
tabs: [
|
|
23
|
+
{ id: 't1', label: 't1', groups: [group('g1', []), group('g2', [])] },
|
|
24
|
+
{ id: 't2', label: 't2', groups: [group('g3', [])] }
|
|
25
|
+
]
|
|
26
|
+
});
|
|
27
|
+
expect(getGroups(s).map((g) => g.id)).toEqual(['g1', 'g2', 'g3']);
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
it('returns flat groups directly', () => {
|
|
31
|
+
const s = schema({ type: 'flat', groups: [group('g1', []), group('g2', [])] });
|
|
32
|
+
expect(getGroups(s).map((g) => g.id)).toEqual(['g1', 'g2']);
|
|
33
|
+
});
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
describe('getGroups — defensive contract', () => {
|
|
37
|
+
it('returns [] when layout is missing', () => {
|
|
38
|
+
expect(getGroups({} as UISchema)).toEqual([]);
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it('returns [] for an unknown layout type', () => {
|
|
42
|
+
expect(getGroups(schema({ type: 'mystery' }))).toEqual([]);
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
it('tolerates missing tabs / groups arrays', () => {
|
|
46
|
+
expect(getGroups(schema({ type: 'tabbed' }))).toEqual([]);
|
|
47
|
+
expect(getGroups(schema({ type: 'flat' }))).toEqual([]);
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
it('tolerates a tab with no groups', () => {
|
|
51
|
+
const s = schema({ type: 'tabbed', tabs: [{ id: 't1', label: 't1' }] });
|
|
52
|
+
expect(getGroups(s)).toEqual([]);
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
describe('getLayoutItems', () => {
|
|
57
|
+
it('collects items across all groups', () => {
|
|
58
|
+
const s = schema({
|
|
59
|
+
type: 'flat',
|
|
60
|
+
groups: [group('g1', [input('a'), linebreak('lb')]), group('g2', [input('b')])]
|
|
61
|
+
});
|
|
62
|
+
expect(getLayoutItems(s).map((i) => (i.type === 'linebreak' ? i.id : i.paramId))).toEqual([
|
|
63
|
+
'a',
|
|
64
|
+
'lb',
|
|
65
|
+
'b'
|
|
66
|
+
]);
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
it('tolerates a group with no items', () => {
|
|
70
|
+
const s = schema({ type: 'flat', groups: [{ id: 'g1', label: 'g1' }] });
|
|
71
|
+
expect(getLayoutItems(s)).toEqual([]);
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
|
|
75
|
+
describe('getInputItems', () => {
|
|
76
|
+
it('keeps only input items, dropping outputs and linebreaks', () => {
|
|
77
|
+
const s = schema({
|
|
78
|
+
type: 'flat',
|
|
79
|
+
groups: [group('g1', [input('a'), linebreak('lb'), { type: 'output', paramId: 'out' }])]
|
|
80
|
+
});
|
|
81
|
+
expect(getInputItems(s).map((i) => i.paramId)).toEqual(['a']);
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
it('preserves the source field so client-input filters work', () => {
|
|
85
|
+
const s = schema({
|
|
86
|
+
type: 'flat',
|
|
87
|
+
groups: [group('g1', [input('a', { kind: 'client' }), input('b')])]
|
|
88
|
+
});
|
|
89
|
+
const clients = getInputItems(s).filter((i) => i.source?.kind === 'client');
|
|
90
|
+
expect(clients.map((i) => i.paramId)).toEqual(['a']);
|
|
91
|
+
});
|
|
92
|
+
});
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
// Schema layout traversal now lives in @selvajs/schemas (next to the types it walks) so
|
|
2
|
+
// any package depending on the schema can traverse it without pulling in @selvajs/ui.
|
|
3
|
+
// Re-exported here to keep it part of @selvajs/ui's published surface for existing
|
|
4
|
+
// consumers.
|
|
5
|
+
export { getGroups, getLayoutItems, getInputItems, type InputLayoutItem } from '@selvajs/schemas';
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import { describe, expect, it } from 'vitest';
|
|
2
|
+
import {
|
|
3
|
+
evaluateRule,
|
|
4
|
+
evaluateVisibility,
|
|
5
|
+
evaluateGroupVisibility,
|
|
6
|
+
buildVisibilityMap,
|
|
7
|
+
itemKey
|
|
8
|
+
} from './visibility-rules';
|
|
9
|
+
import type { GroupVisibilityCondition, LayoutItem, VisibilityRule } from '@selvajs/schemas';
|
|
10
|
+
|
|
11
|
+
// These tests pin the non-obvious branches: operator edge cases that are easy to
|
|
12
|
+
// break in a refactor, and the action/short-circuit precedence in evaluateVisibility.
|
|
13
|
+
// Trivial passthroughs (equals true === true) are omitted on purpose.
|
|
14
|
+
|
|
15
|
+
// `operator` is widened to string so tests can exercise the unknown-operator path.
|
|
16
|
+
function rule(partial: {
|
|
17
|
+
operator: string;
|
|
18
|
+
paramId: string;
|
|
19
|
+
value?: unknown;
|
|
20
|
+
values?: unknown[];
|
|
21
|
+
}): VisibilityRule {
|
|
22
|
+
return partial as unknown as VisibilityRule;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
describe('evaluateRule — operator edge cases', () => {
|
|
26
|
+
it('between requires exactly two values and is inclusive', () => {
|
|
27
|
+
const r = rule({ operator: 'between', paramId: 'x', values: [10, 20] });
|
|
28
|
+
expect(evaluateRule(r, { x: 10 })).toBe(true); // lower bound inclusive
|
|
29
|
+
expect(evaluateRule(r, { x: 20 })).toBe(true); // upper bound inclusive
|
|
30
|
+
expect(evaluateRule(r, { x: 21 })).toBe(false);
|
|
31
|
+
// Wrong arity must fail closed, not throw or pass.
|
|
32
|
+
expect(evaluateRule(rule({ operator: 'between', paramId: 'x', values: [10] }), { x: 15 })).toBe(
|
|
33
|
+
false
|
|
34
|
+
);
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
it('matches returns false for an invalid regex instead of throwing', () => {
|
|
38
|
+
const r = rule({ operator: 'matches', paramId: 'x', value: '(' });
|
|
39
|
+
expect(evaluateRule(r, { x: 'anything' })).toBe(false);
|
|
40
|
+
});
|
|
41
|
+
|
|
42
|
+
it('contains / containsAny coerce scalars and arrays through toStringArray', () => {
|
|
43
|
+
// scalar value is treated as a single-element array
|
|
44
|
+
expect(evaluateRule(rule({ operator: 'contains', paramId: 'x', value: '5' }), { x: 5 })).toBe(
|
|
45
|
+
true
|
|
46
|
+
);
|
|
47
|
+
expect(
|
|
48
|
+
evaluateRule(rule({ operator: 'containsAny', paramId: 'x', values: ['a', 'b'] }), {
|
|
49
|
+
x: ['b', 'c']
|
|
50
|
+
})
|
|
51
|
+
).toBe(true);
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
it('isEmpty treats empty string, null, and [] as empty but not a non-empty value', () => {
|
|
55
|
+
const empty = rule({ operator: 'isEmpty', paramId: 'x' });
|
|
56
|
+
expect(evaluateRule(empty, { x: '' })).toBe(true);
|
|
57
|
+
expect(evaluateRule(empty, { x: null })).toBe(true);
|
|
58
|
+
expect(evaluateRule(empty, { x: [] })).toBe(true);
|
|
59
|
+
expect(evaluateRule(empty, { x: '0' })).toBe(false);
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
it('unknown operator fails closed', () => {
|
|
63
|
+
expect(evaluateRule(rule({ operator: 'definitelyNotAnOp', paramId: 'x' }), { x: 1 })).toBe(
|
|
64
|
+
false
|
|
65
|
+
);
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
describe('evaluateVisibility — action & short-circuit precedence', () => {
|
|
70
|
+
const condition = {
|
|
71
|
+
rules: [{ operator: 'equals', paramId: 'mode', value: 'advanced' }],
|
|
72
|
+
mode: 'all'
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
it('explicit visible:false beats any visibility condition', () => {
|
|
76
|
+
const item = {
|
|
77
|
+
type: 'input',
|
|
78
|
+
paramId: 'p',
|
|
79
|
+
visible: false,
|
|
80
|
+
visibilityCondition: { ...condition, action: 'show' }
|
|
81
|
+
} as unknown as LayoutItem;
|
|
82
|
+
// Condition is met, but visible:false wins.
|
|
83
|
+
expect(evaluateVisibility(item, { mode: 'advanced' })).toEqual({
|
|
84
|
+
visible: false,
|
|
85
|
+
disabled: false
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
it('hide action inverts visibility and only carries defaultValue', () => {
|
|
90
|
+
const item = {
|
|
91
|
+
type: 'input',
|
|
92
|
+
paramId: 'p',
|
|
93
|
+
visibilityCondition: { ...condition, action: 'hide', defaultValue: 7 }
|
|
94
|
+
} as unknown as LayoutItem;
|
|
95
|
+
expect(evaluateVisibility(item, { mode: 'advanced' })).toEqual({
|
|
96
|
+
visible: false,
|
|
97
|
+
disabled: false,
|
|
98
|
+
defaultValue: 7
|
|
99
|
+
});
|
|
100
|
+
expect(evaluateVisibility(item, { mode: 'basic' }).visible).toBe(true);
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
it('disable action keeps item visible and only applies defaultValue when the condition is met', () => {
|
|
104
|
+
const item = {
|
|
105
|
+
type: 'input',
|
|
106
|
+
paramId: 'p',
|
|
107
|
+
visibilityCondition: { ...condition, action: 'disable', defaultValue: 'X' }
|
|
108
|
+
} as unknown as LayoutItem;
|
|
109
|
+
expect(evaluateVisibility(item, { mode: 'advanced' })).toEqual({
|
|
110
|
+
visible: true,
|
|
111
|
+
disabled: true,
|
|
112
|
+
defaultValue: 'X'
|
|
113
|
+
});
|
|
114
|
+
expect(evaluateVisibility(item, { mode: 'basic' })).toEqual({
|
|
115
|
+
visible: true,
|
|
116
|
+
disabled: false,
|
|
117
|
+
defaultValue: undefined
|
|
118
|
+
});
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
it('item without a condition is visible and enabled', () => {
|
|
122
|
+
const item = { type: 'input', paramId: 'p' } as unknown as LayoutItem;
|
|
123
|
+
expect(evaluateVisibility(item, {})).toEqual({ visible: true, disabled: false });
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
describe('buildVisibilityMap', () => {
|
|
128
|
+
const cond = {
|
|
129
|
+
rules: [{ operator: 'equals', paramId: 'mode', value: 'advanced' }],
|
|
130
|
+
mode: 'all'
|
|
131
|
+
};
|
|
132
|
+
|
|
133
|
+
it('keys each item by paramId (inputs/outputs) or id (linebreak) and matches evaluateVisibility', () => {
|
|
134
|
+
const items = [
|
|
135
|
+
{ type: 'input', paramId: 'a' },
|
|
136
|
+
{ type: 'linebreak', id: 'lb1' },
|
|
137
|
+
{
|
|
138
|
+
type: 'input',
|
|
139
|
+
paramId: 'b',
|
|
140
|
+
visibilityCondition: { ...cond, action: 'show' }
|
|
141
|
+
}
|
|
142
|
+
] as unknown as LayoutItem[];
|
|
143
|
+
const values = { mode: 'basic' };
|
|
144
|
+
|
|
145
|
+
const map = buildVisibilityMap(items, values);
|
|
146
|
+
expect(map.a).toEqual(evaluateVisibility(items[0], values));
|
|
147
|
+
expect(map.lb1).toEqual(evaluateVisibility(items[1], values));
|
|
148
|
+
// 'b' shows only when mode === 'advanced'; here it's hidden.
|
|
149
|
+
expect(map.b.visible).toBe(false);
|
|
150
|
+
expect(map.b).toEqual(evaluateVisibility(items[2], values));
|
|
151
|
+
});
|
|
152
|
+
|
|
153
|
+
it('itemKey returns paramId for controls and id for linebreaks', () => {
|
|
154
|
+
expect(itemKey({ type: 'input', paramId: 'p1' } as unknown as LayoutItem)).toBe('p1');
|
|
155
|
+
expect(itemKey({ type: 'linebreak', id: 'lb' } as unknown as LayoutItem)).toBe('lb');
|
|
156
|
+
});
|
|
157
|
+
});
|
|
158
|
+
|
|
159
|
+
describe('evaluateGroupVisibility', () => {
|
|
160
|
+
it('hide action inverts, show is the default, no condition means visible', () => {
|
|
161
|
+
const cond = (action?: string): { visibilityCondition: GroupVisibilityCondition } => ({
|
|
162
|
+
visibilityCondition: {
|
|
163
|
+
action,
|
|
164
|
+
mode: 'all',
|
|
165
|
+
rules: [{ operator: 'equals', paramId: 'show', value: true }]
|
|
166
|
+
} as unknown as GroupVisibilityCondition
|
|
167
|
+
});
|
|
168
|
+
expect(evaluateGroupVisibility(cond('hide'), { show: true })).toBe(false);
|
|
169
|
+
expect(evaluateGroupVisibility(cond('show'), { show: true })).toBe(true);
|
|
170
|
+
expect(evaluateGroupVisibility(cond(), { show: true })).toBe(true);
|
|
171
|
+
expect(evaluateGroupVisibility({}, {})).toBe(true);
|
|
172
|
+
});
|
|
173
|
+
});
|
|
@@ -84,6 +84,31 @@ export function evaluateVisibility(
|
|
|
84
84
|
return actionFn(met, defaultValue);
|
|
85
85
|
}
|
|
86
86
|
|
|
87
|
+
/**
|
|
88
|
+
* Stable key for a layout item: `paramId` for inputs/outputs, `id` for linebreaks.
|
|
89
|
+
* Mirrors the key the renderers use in their `{#each}` blocks.
|
|
90
|
+
*/
|
|
91
|
+
export function itemKey(item: LayoutItem): string {
|
|
92
|
+
return item.type === 'linebreak' ? item.id : item.paramId;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/**
|
|
96
|
+
* Evaluates every item's visibility once against the current values, keyed by itemKey.
|
|
97
|
+
* Callers that touch the same items more than once per render (column layout + cell
|
|
98
|
+
* render, plus the default-value sweep) read from this single map instead of
|
|
99
|
+
* re-evaluating per access — one source of truth for "what's visible right now".
|
|
100
|
+
*/
|
|
101
|
+
export function buildVisibilityMap(
|
|
102
|
+
items: LayoutItem[],
|
|
103
|
+
values: Record<string, unknown>
|
|
104
|
+
): Record<string, VisibilityResult> {
|
|
105
|
+
const map: Record<string, VisibilityResult> = {};
|
|
106
|
+
for (const item of items) {
|
|
107
|
+
map[itemKey(item)] = evaluateVisibility(item, values);
|
|
108
|
+
}
|
|
109
|
+
return map;
|
|
110
|
+
}
|
|
111
|
+
|
|
87
112
|
export function evaluateGroupVisibility(
|
|
88
113
|
group: { visibilityCondition?: GroupVisibilityCondition },
|
|
89
114
|
values: Record<string, unknown>
|
package/src/lib/types/solveFn.ts
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* @property errors - Optional array of error messages that occurred
|
|
7
7
|
* @property warnings - Optional array of warning messages from the computation
|
|
8
8
|
*/
|
|
9
|
-
interface SolveResult {
|
|
9
|
+
export interface SolveResult {
|
|
10
10
|
outputs: Record<string, unknown>;
|
|
11
11
|
meshes?: any[];
|
|
12
12
|
errors?: string[];
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Wrapper utilities for file downloads from Grasshopper outputs
|
|
3
|
-
* Uses the core package implementation for file handling
|
|
4
|
-
*/
|
|
5
|
-
|
|
6
1
|
import { downloadFileData, type FileData } from '@selvajs/compute';
|
|
2
|
+
import { SvelteMap } from 'svelte/reactivity';
|
|
7
3
|
import { APP_DEFAULTS } from '../constants';
|
|
8
4
|
|
|
9
|
-
const MIME_BY_EXT: Record<string, string> = {
|
|
5
|
+
export const MIME_BY_EXT: Record<string, string> = {
|
|
10
6
|
'.png': 'image/png',
|
|
11
7
|
'.jpg': 'image/jpeg',
|
|
12
8
|
'.jpeg': 'image/jpeg',
|
|
@@ -45,10 +41,6 @@ function saveSingleFile(file: FileData): void {
|
|
|
45
41
|
URL.revokeObjectURL(a.href);
|
|
46
42
|
}
|
|
47
43
|
|
|
48
|
-
/**
|
|
49
|
-
* Download file(s) from Grasshopper outputs
|
|
50
|
-
* Single files are downloaded directly, multiple files are packaged as ZIP
|
|
51
|
-
*/
|
|
52
44
|
export async function downloadFiles(
|
|
53
45
|
fileData: FileData | FileData[],
|
|
54
46
|
fileName: string = 'grasshopper-output'
|
|
@@ -73,9 +65,6 @@ export async function downloadFiles(
|
|
|
73
65
|
}
|
|
74
66
|
}
|
|
75
67
|
|
|
76
|
-
/**
|
|
77
|
-
* Check if data is FileData
|
|
78
|
-
*/
|
|
79
68
|
export function isFileData(data: unknown): data is FileData {
|
|
80
69
|
return (
|
|
81
70
|
typeof data === 'object' &&
|
|
@@ -86,9 +75,17 @@ export function isFileData(data: unknown): data is FileData {
|
|
|
86
75
|
);
|
|
87
76
|
}
|
|
88
77
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
78
|
+
export function groupMessages(messages: string[]): Array<{ message: string; count: number }> {
|
|
79
|
+
const grouped = new SvelteMap<string, number>();
|
|
80
|
+
for (const msg of messages) {
|
|
81
|
+
const baseMsg = msg.replace(/\([a-f0-9-]{36}\)$/i, '(...)').trim();
|
|
82
|
+
grouped.set(baseMsg, (grouped.get(baseMsg) ?? 0) + 1);
|
|
83
|
+
}
|
|
84
|
+
return Array.from(grouped.entries())
|
|
85
|
+
.map(([message, count]) => ({ message, count }))
|
|
86
|
+
.sort((a, b) => b.count - a.count);
|
|
87
|
+
}
|
|
88
|
+
|
|
92
89
|
export function formatFileSize(bytes: number): string {
|
|
93
90
|
if (bytes === 0) return '0 Bytes';
|
|
94
91
|
|
|
@@ -99,10 +96,6 @@ export function formatFileSize(bytes: number): string {
|
|
|
99
96
|
return Math.round((bytes / Math.pow(k, i)) * 100) / 100 + ' ' + sizes[i];
|
|
100
97
|
}
|
|
101
98
|
|
|
102
|
-
/**
|
|
103
|
-
* Get approximate file size from base64 string
|
|
104
|
-
*/
|
|
105
99
|
export function getBase64FileSize(base64: string): number {
|
|
106
|
-
// Base64 encoded string is approximately 33% larger than original
|
|
107
100
|
return Math.ceil((base64.length * 3) / 4);
|
|
108
101
|
}
|
|
@@ -1,22 +1,6 @@
|
|
|
1
|
-
//
|
|
2
|
-
//
|
|
3
|
-
//
|
|
4
|
-
// Plain-HTTP deployments — common for first-time self-hosters trying things
|
|
5
|
-
// out — get `crypto.randomUUID is not a function`, which is a confusing
|
|
6
|
-
// browser-level error nobody can diagnose without devtools open.
|
|
7
|
-
//
|
|
8
|
-
// We try in order:
|
|
9
|
-
// 1. crypto.randomUUID() — fastest path, available in secure contexts
|
|
10
|
-
// 2. crypto.getRandomValues() — Web Crypto's lower-level entropy, works
|
|
11
|
-
// in any context that ships Web Crypto
|
|
12
|
-
// 3. Math.random() fallback — last resort; non-cryptographic, but the
|
|
13
|
-
// IDs we generate here are only used as
|
|
14
|
-
// collision-resistant keys for client-side
|
|
15
|
-
// form rows, not as security tokens.
|
|
16
|
-
//
|
|
17
|
-
// Callers that need cryptographic randomness (tokens, secrets) must NOT use
|
|
18
|
-
// this — they should fail loudly in insecure contexts instead of silently
|
|
19
|
-
// downgrading.
|
|
1
|
+
// Falls back through crypto.randomUUID → crypto.getRandomValues → Math.random so
|
|
2
|
+
// plain-HTTP deployments don't crash. Math.random IDs are non-cryptographic —
|
|
3
|
+
// fine for collision-resistant UI keys, not for tokens or secrets.
|
|
20
4
|
export function randomId(): string {
|
|
21
5
|
const c = typeof crypto !== 'undefined' ? crypto : undefined;
|
|
22
6
|
if (c?.randomUUID) return c.randomUUID();
|
|
@@ -1,169 +0,0 @@
|
|
|
1
|
-
<script lang="ts">
|
|
2
|
-
import { CircleAlert, TriangleAlert, ChevronDown, ChevronRight } from '@lucide/svelte';
|
|
3
|
-
import { SvelteMap } from 'svelte/reactivity';
|
|
4
|
-
import * as Collapsible from '../primitives/collapsible';
|
|
5
|
-
import * as Dialog from '../primitives/dialog';
|
|
6
|
-
|
|
7
|
-
interface Props {
|
|
8
|
-
errors?: string[];
|
|
9
|
-
warnings?: string[];
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
let { errors = [], warnings = [] }: Props = $props();
|
|
13
|
-
|
|
14
|
-
let open = $state(false);
|
|
15
|
-
|
|
16
|
-
let showErrors = $state(true);
|
|
17
|
-
let showWarnings = $state(false);
|
|
18
|
-
|
|
19
|
-
function groupMessages(messages: string[]): Array<{ message: string; count: number }> {
|
|
20
|
-
const grouped = new SvelteMap<string, number>();
|
|
21
|
-
|
|
22
|
-
for (const msg of messages) {
|
|
23
|
-
// Extract the base message without the component GUID
|
|
24
|
-
const baseMsg = msg.replace(/\([a-f0-9-]{36}\)$/i, '(...)').trim();
|
|
25
|
-
const currentCount = grouped.get(baseMsg) || 0;
|
|
26
|
-
grouped.set(baseMsg, currentCount + 1);
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
return Array.from(grouped.entries())
|
|
30
|
-
.map(([message, count]) => ({ message, count }))
|
|
31
|
-
.sort((a, b) => b.count - a.count);
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
const groupedErrors = $derived(groupMessages(errors));
|
|
35
|
-
const groupedWarnings = $derived(groupMessages(warnings));
|
|
36
|
-
const hasMessages = $derived(errors.length > 0 || warnings.length > 0);
|
|
37
|
-
const totalCount = $derived(errors.length + warnings.length);
|
|
38
|
-
</script>
|
|
39
|
-
|
|
40
|
-
{#if hasMessages}
|
|
41
|
-
<Dialog.Root bind:open>
|
|
42
|
-
<Dialog.Trigger
|
|
43
|
-
class="bottom-12 right-2 sm:bottom-4 sm:right-4 sm:block fixed z-100 hidden focus:outline-none"
|
|
44
|
-
>
|
|
45
|
-
<div
|
|
46
|
-
class="shadow-lg text-xs font-medium hover:shadow-xl hover:-translate-y-0.5 active:translate-y-0 flex cursor-pointer items-stretch overflow-hidden rounded-full border transition-all duration-150
|
|
47
|
-
{errors.length > 0
|
|
48
|
-
? 'text-destructive-foreground border-destructive/30 bg-destructive'
|
|
49
|
-
: 'border-warning/30 bg-warning/5 text-warning-foreground'}"
|
|
50
|
-
>
|
|
51
|
-
{#if errors.length > 0}
|
|
52
|
-
<span class="gap-1.5 px-3 py-1.5 flex items-center">
|
|
53
|
-
<CircleAlert class="h-3.5 w-3.5 shrink-0" />
|
|
54
|
-
{errors.length}
|
|
55
|
-
</span>
|
|
56
|
-
{/if}
|
|
57
|
-
{#if warnings.length > 0}
|
|
58
|
-
{#if errors.length > 0}
|
|
59
|
-
<span class="bg-destructive-foreground/20 w-px self-stretch"></span>
|
|
60
|
-
<span class="gap-1.5 px-3 py-1.5 flex items-center bg-destructive/80">
|
|
61
|
-
<TriangleAlert class="h-3.5 w-3.5 shrink-0" />
|
|
62
|
-
{warnings.length}
|
|
63
|
-
</span>
|
|
64
|
-
{:else}
|
|
65
|
-
<span class="gap-1.5 px-3 py-1.5 flex items-center">
|
|
66
|
-
<TriangleAlert class="h-3.5 w-3.5 shrink-0" />
|
|
67
|
-
{warnings.length}
|
|
68
|
-
</span>
|
|
69
|
-
{/if}
|
|
70
|
-
{/if}
|
|
71
|
-
</div>
|
|
72
|
-
</Dialog.Trigger>
|
|
73
|
-
|
|
74
|
-
<Dialog.Content class="max-w-2xl max-h-[80vh]">
|
|
75
|
-
<Dialog.Header>
|
|
76
|
-
<Dialog.Title class="gap-2 flex items-center">
|
|
77
|
-
<CircleAlert class="h-5 w-5" />
|
|
78
|
-
Compute Messages
|
|
79
|
-
</Dialog.Title>
|
|
80
|
-
<Dialog.Description>
|
|
81
|
-
{totalCount}
|
|
82
|
-
{totalCount === 1 ? 'issue' : 'issues'} detected during solve
|
|
83
|
-
</Dialog.Description>
|
|
84
|
-
</Dialog.Header>
|
|
85
|
-
|
|
86
|
-
<div class="space-y-3 pr-2 overflow-y-auto" style="max-height: calc(80vh - 180px);">
|
|
87
|
-
{#if errors.length > 0}
|
|
88
|
-
<Collapsible.Root bind:open={showErrors}>
|
|
89
|
-
<div class="overflow-hidden rounded-lg border border-destructive bg-card">
|
|
90
|
-
<div class="px-4 py-3 flex items-center">
|
|
91
|
-
<Collapsible.Trigger
|
|
92
|
-
class="-mx-4 -my-3 gap-3 px-4 py-3 flex flex-1 items-center text-left transition-colors hover:bg-destructive/5"
|
|
93
|
-
>
|
|
94
|
-
{#if showErrors}
|
|
95
|
-
<ChevronDown class="h-4 w-4 shrink-0 text-destructive" />
|
|
96
|
-
{:else}
|
|
97
|
-
<ChevronRight class="h-4 w-4 shrink-0 text-destructive" />
|
|
98
|
-
{/if}
|
|
99
|
-
<CircleAlert class="h-4 w-4 shrink-0 text-destructive" />
|
|
100
|
-
<span class="text-sm font-medium text-destructive">
|
|
101
|
-
{errors.length === 1 ? '1 Error' : `${errors.length} Errors`}
|
|
102
|
-
</span>
|
|
103
|
-
</Collapsible.Trigger>
|
|
104
|
-
</div>
|
|
105
|
-
|
|
106
|
-
<Collapsible.Content class="space-y-0">
|
|
107
|
-
<div class="max-h-60 px-4 py-3 overflow-y-auto border-t border-destructive bg-card">
|
|
108
|
-
<ul class="space-y-2">
|
|
109
|
-
{#each groupedErrors as { message, count } (message)}
|
|
110
|
-
<li class="gap-2 text-sm flex text-destructive/90">
|
|
111
|
-
<span class="shrink-0">•</span>
|
|
112
|
-
<span class="flex-1">
|
|
113
|
-
{message}
|
|
114
|
-
{#if count > 1}
|
|
115
|
-
<span class="ml-1 font-medium text-destructive/70">×{count} </span>
|
|
116
|
-
{/if}
|
|
117
|
-
</span>
|
|
118
|
-
</li>
|
|
119
|
-
{/each}
|
|
120
|
-
</ul>
|
|
121
|
-
</div>
|
|
122
|
-
</Collapsible.Content>
|
|
123
|
-
</div>
|
|
124
|
-
</Collapsible.Root>
|
|
125
|
-
{/if}
|
|
126
|
-
|
|
127
|
-
{#if warnings.length > 0}
|
|
128
|
-
<Collapsible.Root bind:open={showWarnings}>
|
|
129
|
-
<div class="overflow-hidden rounded-lg border border-warning/50 bg-card">
|
|
130
|
-
<div class="px-4 py-3 flex items-center">
|
|
131
|
-
<Collapsible.Trigger
|
|
132
|
-
class="-mx-4 -my-3 gap-3 px-4 py-3 flex flex-1 items-center text-left transition-colors hover:bg-warning/5"
|
|
133
|
-
>
|
|
134
|
-
{#if showWarnings}
|
|
135
|
-
<ChevronDown class="h-4 w-4 shrink-0 text-warning" />
|
|
136
|
-
{:else}
|
|
137
|
-
<ChevronRight class="h-4 w-4 shrink-0 text-warning" />
|
|
138
|
-
{/if}
|
|
139
|
-
<TriangleAlert class="h-4 w-4 shrink-0 text-warning" />
|
|
140
|
-
<span class="text-sm font-medium text-warning">
|
|
141
|
-
{warnings.length === 1 ? '1 Warning' : `${warnings.length} Warnings`}
|
|
142
|
-
</span>
|
|
143
|
-
</Collapsible.Trigger>
|
|
144
|
-
</div>
|
|
145
|
-
|
|
146
|
-
<Collapsible.Content class="space-y-0">
|
|
147
|
-
<div class="max-h-60 px-4 py-3 overflow-y-auto border-t border-warning/50 bg-card">
|
|
148
|
-
<ul class="space-y-2">
|
|
149
|
-
{#each groupedWarnings as { message, count } (message)}
|
|
150
|
-
<li class="gap-2 text-sm flex text-muted-foreground">
|
|
151
|
-
<span class="shrink-0">•</span>
|
|
152
|
-
<span class="flex-1">
|
|
153
|
-
{message}
|
|
154
|
-
{#if count > 1}
|
|
155
|
-
<span class="ml-1 font-medium text-warning/70">×{count}</span>
|
|
156
|
-
{/if}
|
|
157
|
-
</span>
|
|
158
|
-
</li>
|
|
159
|
-
{/each}
|
|
160
|
-
</ul>
|
|
161
|
-
</div>
|
|
162
|
-
</Collapsible.Content>
|
|
163
|
-
</div>
|
|
164
|
-
</Collapsible.Root>
|
|
165
|
-
{/if}
|
|
166
|
-
</div>
|
|
167
|
-
</Dialog.Content>
|
|
168
|
-
</Dialog.Root>
|
|
169
|
-
{/if}
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
export { default as AppLayout } from './AppLayout.svelte';
|
|
2
|
-
export { default as ComputeApp } from './ComputeApp.svelte';
|
|
3
|
-
export { default as ComputeMessages } from './ComputeMessages.svelte';
|
|
4
|
-
export { default as ParameterPresetManager } from './ParameterPresetManager.svelte';
|
|
5
|
-
export { default as CollapsedPanelStrip } from './CollapsedPanelStrip.svelte';
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
export { default as AppLayout } from './AppLayout.svelte';
|
|
2
|
-
export { default as ComputeApp } from './ComputeApp.svelte';
|
|
3
|
-
export { default as ComputeMessages } from './ComputeMessages.svelte';
|
|
4
|
-
export { default as ParameterPresetManager } from './ParameterPresetManager.svelte';
|
|
5
|
-
export { default as CollapsedPanelStrip } from './CollapsedPanelStrip.svelte';
|