Skip to content

Fix/input validation #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
battlesquid merged 3 commits into from
Sep 6, 2025
Merged

Fix/input validation #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02134e0
wip: fix invalid input bugs
battlesquid Sep 6, 2025
cffe083
fix: add more constraints/fallbacks for inputs, schema
battlesquid Sep 6, 2025
99fa3c8
chore: neat
battlesquid Sep 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions packages/app/src/components/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
Button,
Card,
Divider,
Group,
ScrollArea,
Stack,
Title,
Expand Down Expand Up @@ -118,10 +117,10 @@ export function Sidebar(props: SidebarProps) {
</Stack>
</AppShell.Section>
<AppShell.Section>
<Group gap="xs">
<Stack gap="xs">
<ShareButton />
<ExportButton />
</Group>
</Stack>
</AppShell.Section>
</Card>
<AppShell.Section>
Expand Down
3 changes: 3 additions & 0 deletions packages/app/src/components/sidebar_inputs/base_padding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export function BasePaddingInput() {
min={0}
step={0.5}
value={padding}
clampBehavior="strict"
allowNegative={false}
allowLeadingZeros={false}
onChange={(value) =>
setInputs({
padding: safeFloat(value, 0),
Expand Down
23 changes: 17 additions & 6 deletions packages/app/src/components/sidebar_inputs/generate_section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ export function GenerateSection(props: GenerateSectionProps) {
placeholder="Start Year"
min={MIN_START_YEAR}
max={new Date().getFullYear()}
allowNegative={false}
allowDecimal={false}
allowLeadingZeros={false}
stepHoldDelay={500}
stepHoldInterval={100}
value={startYear}
Expand All @@ -96,7 +99,9 @@ export function GenerateSection(props: GenerateSectionProps) {
currentStartYear = lastValidStartYear;
}
if (currentStartYear > endYear) {
setEndYear(currentStartYear);
setEndYear(
Math.min(new Date().getFullYear(), currentStartYear as number),
);
}
}}
onChange={setStartYear}
Expand All @@ -106,6 +111,9 @@ export function GenerateSection(props: GenerateSectionProps) {
placeholder="End Year"
min={MIN_START_YEAR}
max={new Date().getFullYear()}
allowNegative={false}
allowDecimal={false}
allowLeadingZeros={false}
stepHoldDelay={500}
stepHoldInterval={100}
value={endYear}
Expand All @@ -116,27 +124,30 @@ export function GenerateSection(props: GenerateSectionProps) {
currentEndYear = lastValidEndYear;
}
if (currentEndYear < startYear) {
setStartYear(currentEndYear);
setStartYear(
Math.min(new Date().getFullYear(), currentEndYear as number),
);
}
}}
onChange={setEndYear}
/>
</Group>
<Button
className="mona-sans-wide"
fullWidth
className="mona-sans-wide"
tt="uppercase"
disabled={name.trim() === ""}
variant="light"
size="xs"
onClick={() =>
setInputs({
name,
startYear: startYear as number,
endYear: endYear as number,
})
}
variant="light"
size="xs"
>
GENERATE
Generate
</Button>
</>
);
Expand Down
3 changes: 3 additions & 0 deletions packages/app/src/components/sidebar_inputs/scale.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export function ScaleInput() {
min={1}
step={0.1}
value={scale}
clampBehavior="strict"
allowNegative={false}
allowLeadingZeros={false}
onChange={(value) => setInputs({ scale: safeFloat(value, 1) })}
/>
);
Expand Down
9 changes: 6 additions & 3 deletions packages/app/src/components/sidebar_inputs/tower_dampening.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,14 @@ export function TowerDampeningInput() {
min={1}
allowDecimal={false}
value={dampening}
onChange={(value) =>
clampBehavior="strict"
allowNegative={false}
onChange={(value) => {
console.log(value);
setInputs({
dampening: safeInt(value, 1),
})
}
});
}}
/>
);
}
73 changes: 48 additions & 25 deletions packages/app/src/share/urlShare.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,63 @@ import {
} from "lz-string";
import { z } from "zod";

import type { SkylineModelInputParameters } from "../stores/parameters";
import {
DEFAULT_INPUT_PARAMETERS,
type SkylineModelInputParameters,
} from "../stores/parameters";
import { ExportFormat } from "../three/export";
import { SkylineBaseShape } from "../three/types";

export const URL_PARAM_KEY = "s";

export const MinimalShareSchema = z.object({
v: z.literal(1),
type: z.literal("minimal"),
name: z.string(),
startYear: z.number().int(),
endYear: z.number().int(),
v: z.literal(1).catch(1),
type: z.literal("minimal").catch("minimal"),
name: z.string().catch(DEFAULT_INPUT_PARAMETERS.name),
startYear: z
.number()
.int()
.max(new Date().getFullYear())
.catch(DEFAULT_INPUT_PARAMETERS.startYear),
endYear: z
.number()
.int()
.max(new Date().getFullYear())
.catch(DEFAULT_INPUT_PARAMETERS.endYear),
});

export const FullShareSchema = z.object({
v: z.literal(1),
type: z.literal("full"),
name: z.string(),
nameOverride: z.string(),
startYear: z.number().int(),
endYear: z.number().int(),
insetText: z.boolean(),
towerSize: z.number(),
dampening: z.number(),
shape: z.nativeEnum(SkylineBaseShape),
padding: z.number(),
textDepth: z.number(),
color: z.string(),
showContributionColor: z.boolean(),
scale: z.number(),
exportFormat: z.nativeEnum(ExportFormat),
logoOffset: z.number(),
nameOffset: z.number(),
yearOffset: z.number(),
v: z.literal(1).catch(1),
type: z.literal("full").catch("full"),
name: z.string().catch(DEFAULT_INPUT_PARAMETERS.name),
startYear: z
.number()
.int()
.max(new Date().getFullYear())
.catch(DEFAULT_INPUT_PARAMETERS.startYear),
endYear: z
.number()
.int()
.max(new Date().getFullYear())
.catch(DEFAULT_INPUT_PARAMETERS.endYear),
nameOverride: z.string().catch(DEFAULT_INPUT_PARAMETERS.nameOverride),
insetText: z.boolean().catch(DEFAULT_INPUT_PARAMETERS.insetText),
towerSize: z.number().catch(DEFAULT_INPUT_PARAMETERS.towerSize),
dampening: z.number().min(1).catch(DEFAULT_INPUT_PARAMETERS.dampening),
shape: z.enum(SkylineBaseShape).catch(DEFAULT_INPUT_PARAMETERS.shape),
padding: z.number().min(0).catch(DEFAULT_INPUT_PARAMETERS.padding),
textDepth: z.number().catch(DEFAULT_INPUT_PARAMETERS.textDepth),
color: z.string().catch(DEFAULT_INPUT_PARAMETERS.color),
showContributionColor: z
.boolean()
.catch(DEFAULT_INPUT_PARAMETERS.showContributionColor),
scale: z.number().min(1).catch(DEFAULT_INPUT_PARAMETERS.scale),
exportFormat: z
.enum(ExportFormat)
.catch(DEFAULT_INPUT_PARAMETERS.exportFormat),
logoOffset: z.number().catch(DEFAULT_INPUT_PARAMETERS.logoOffset),
nameOffset: z.number().catch(DEFAULT_INPUT_PARAMETERS.nameOffset),
yearOffset: z.number().catch(DEFAULT_INPUT_PARAMETERS.yearOffset),
});

export const ShareSchema = z.union([MinimalShareSchema, FullShareSchema]);
Expand Down
6 changes: 4 additions & 2 deletions packages/app/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ export const safeFloat = (value: string | number, min: number) => {
if (value === "") {
return min;
}
return Number.parseFloat(`${value}`);
const safeValue = Number.parseFloat(`${value}`);
return Math.max(safeValue, min);
};

export const safeInt = (value: string | number, min: number) => {
if (value === "") {
return min;
}
return Number.parseInt(`${value}`);
const safeValue = Number.parseInt(`${value}`);
return Math.max(safeValue, min);
};

export const safeString = (value: string, fallback: string) => {
Expand Down