glyphdiff.com/frontend-svelte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: enforce brackets for if clause and for/while loops

Browse Source
This commit is contained in:
Ilia Mashkov
2026-04-17 13:05:36 +03:00
parent cfaff46d59
commit 12e8bc0a89
25 changed files with 213 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dprint.json
View File

@@ -31,7 +31,12 @@
"importDeclaration.forceMultiLine": "whenMultiple",
"importDeclaration.forceSingleLine": false,
"exportDeclaration.forceMultiLine": "whenMultiple",
"exportDeclaration.forceSingleLine": false
"exportDeclaration.forceSingleLine": false,
"ifStatement.useBraces": "always",
"whileStatement.useBraces": "always",
"forStatement.useBraces": "always",
"forInStatement.useBraces": "always",
"forOfStatement.useBraces": "always"
},
"json": {
"indentWidth": 2,

20
src/entities/Breadcrumb/model/store/scrollBreadcrumbsStore.svelte.ts
View File

@@ -105,13 +105,17 @@ class ScrollBreadcrumbsStore {
* (fires as soon as any part of element crosses viewport edge).
*/
#initObserver(): void {
if (this.#observer) return;
if (this.#observer) {
return;
}
this.#observer = new IntersectionObserver(
entries => {
for (const entry of entries) {
const item = this.#items.find(i => i.element === entry.target);
if (!item) continue;
if (!item) {
continue;
}
if (!entry.isIntersecting && this.#isScrollingDown) {
// Element exited viewport while scrolling DOWN - add to breadcrumbs
@@ -199,7 +203,9 @@ class ScrollBreadcrumbsStore {
* @param offset - Scroll offset in pixels (for sticky headers)
*/
add(item: BreadcrumbItem, offset = 0): void {
if (this.#items.find(i => i.index === item.index)) return;
if (this.#items.find(i => i.index === item.index)) {
return;
}
this.#scrollOffset = offset;
this.#items.push(item);
@@ -216,7 +222,9 @@ class ScrollBreadcrumbsStore {
*/
remove(index: number): void {
const item = this.#items.find(i => i.index === index);
if (!item) return;
if (!item) {
return;
}
this.#observer?.unobserve(item.element);
this.#items = this.#items.filter(i => i.index !== index);
@@ -237,7 +245,9 @@ class ScrollBreadcrumbsStore {
*/
scrollTo(index: number, container: HTMLElement | Window = window): void {
const item = this.#items.find(i => i.index === index);
if (!item) return;
if (!item) {
return;
}
const rect = item.element.getBoundingClientRect();
const scrollTop = container === window ? window.scrollY : (container as HTMLElement).scrollTop;

8
src/entities/Breadcrumb/model/store/scrollBreadcrumbsStore.test.ts
View File

@@ -26,7 +26,9 @@ class MockIntersectionObserver implements IntersectionObserver {
constructor(callback: IntersectionObserverCallback, options?: IntersectionObserverInit) {
this.callbacks.push(callback);
if (options?.rootMargin) this.rootMargin = options.rootMargin;
if (options?.rootMargin) {
this.rootMargin = options.rootMargin;
}
if (options?.threshold) {
this.thresholds = Array.isArray(options.threshold) ? options.threshold : [options.threshold];
}
@@ -120,7 +122,9 @@ describe('ScrollBreadcrumbsStore', () => {
(event: string, listener: EventListenerOrEventListenerObject) => {
if (event === 'scroll') {
const index = scrollListeners.indexOf(listener as () => void);
if (index > -1) scrollListeners.splice(index, 1);
if (index > -1) {
scrollListeners.splice(index, 1);
}
}
return undefined;
},

4
src/entities/Font/api/proxy/proxyFonts.ts
View File

@@ -197,7 +197,9 @@ export async function fetchProxyFontById(
* @returns Promise resolving to an array of fonts
*/
export async function fetchFontsByIds(ids: string[]): Promise<UnifiedFont[]> {
if (ids.length === 0) return [];
if (ids.length === 0) {
return [];
}
const queryString = ids.join(',');
const url = `${PROXY_API_URL}/batch?ids=${queryString}`;

8
src/entities/Font/lib/mocks/stores.mock.ts
View File

@@ -529,8 +529,12 @@ export function createMockStore<T>(config: {
* Returns semantic status string
*/
get status() {
if (isLoading) return 'pending';
if (isError) return 'error';
if (isLoading) {
return 'pending';
}
if (isError) {
return 'error';
}
return 'success';
},
};

16
src/entities/Font/lib/sizeResolver/createFontRowSizeResolver.ts
View File

@@ -93,12 +93,16 @@ export function createFontRowSizeResolver(options: FontRowSizeResolverOptions):
return function resolveRowHeight(rowIndex: number): number {
const fonts = options.getFonts();
const font = fonts[rowIndex];
if (!font) return options.fallbackHeight;
if (!font) {
return options.fallbackHeight;
}
const containerWidth = options.getContainerWidth();
const previewText = options.getPreviewText();
if (containerWidth <= 0 || !previewText) return options.fallbackHeight;
if (containerWidth <= 0 || !previewText) {
return options.fallbackHeight;
}
const weight = options.getWeight();
// generateFontKey: '{id}@{weight}' for static fonts, '{id}@vf' for variable fonts.
@@ -107,7 +111,9 @@ export function createFontRowSizeResolver(options: FontRowSizeResolverOptions):
// Reading via getStatus() allows the caller to pass appliedFontsManager.statuses.get(),
// which creates a Svelte 5 reactive dependency when called inside $derived.by.
const status = options.getStatus(fontKey);
if (status !== 'loaded') return options.fallbackHeight;
if (status !== 'loaded') {
return options.fallbackHeight;
}
const fontSizePx = options.getFontSizePx();
const lineHeightPx = options.getLineHeightPx();
@@ -116,7 +122,9 @@ export function createFontRowSizeResolver(options: FontRowSizeResolverOptions):
const cacheKey = `${fontCssString}|${previewText}|${contentWidth}|${lineHeightPx}`;
const cached = cache.get(cacheKey);
if (cached !== undefined) return cached;
if (cached !== undefined) {
return cached;
}
const { totalHeight } = engine.layout(previewText, fontCssString, contentWidth, lineHeightPx);
const result = totalHeight + options.chromeHeight;

12
src/entities/Font/model/store/appliedFontsStore/appliedFontsStore.svelte.ts
View File

@@ -246,12 +246,16 @@ export class AppliedFontsManager {
);
for (const result of results) {
if (result.ok) continue;
if (result.ok) {
continue;
}
const { key, config, reason } = result;
const isAbort = reason instanceof FontFetchError
&& reason.cause instanceof Error
&& reason.cause.name === 'AbortError';
if (isAbort) continue;
if (isAbort) {
continue;
}
if (reason instanceof FontFetchError) {
console.error(`Font fetch failed: ${config.name}`, reason);
}
@@ -293,7 +297,9 @@ export class AppliedFontsManager {
// Remove FontFace from document to free memory
const font = this.#loadedFonts.get(key);
if (font) document.fonts.delete(font);
if (font) {
document.fonts.delete(font);
}
// Evict from cache and cleanup URL mapping
const url = this.#urlByKey.get(key);

4
src/entities/Font/model/store/batchFontStore.svelte.ts
View File

@@ -15,7 +15,9 @@ import type { UnifiedFont } from '../../model/types';
* Standalone function to avoid 'this' issues during construction.
*/
async function fetchAndSeed(ids: string[]): Promise<UnifiedFont[]> {
if (ids.length === 0) return [];
if (ids.length === 0) {
return [];
}
let response: UnifiedFont[];
try {

16
src/entities/Font/model/store/fontStore/fontStore.svelte.ts
View File

@@ -166,7 +166,9 @@ export class FontStore {
const data = this.#qc.getQueryData<InfiniteData<ProxyFontsResponse, PageParam>>(
this.buildQueryKey(this.#params),
);
if (!data) return undefined;
if (!data) {
return undefined;
}
return data.pages.flatMap(p => p.fonts);
}
@@ -336,9 +338,15 @@ export class FontStore {
throw new FontNetworkError(cause);
}
if (!response) throw new FontResponseError('response', response);
if (!response.fonts) throw new FontResponseError('response.fonts', response.fonts);
if (!Array.isArray(response.fonts)) throw new FontResponseError('response.fonts', response.fonts);
if (!response) {
throw new FontResponseError('response', response);
}
if (!response.fonts) {
throw new FontResponseError('response.fonts', response.fonts);
}
if (!Array.isArray(response.fonts)) {
throw new FontResponseError('response.fonts', response.fonts);
}
return {
fonts: response.fonts,

4
src/entities/Font/ui/FontVirtualList/FontVirtualList.svelte
View File

@@ -65,7 +65,9 @@ function handleInternalVisibleChange(items: UnifiedFont[]) {
$effect(() => {
const configs: FontLoadRequestConfig[] = visibleFonts.flatMap(item => {
const url = getFontUrl(item, weight);
if (!url) return [];
if (!url) {
return [];
}
return [{ id: item.id, name: item.name, weight, url, isVariable: item.features?.isVariable }];
});
if (configs.length > 0) {

40
src/features/SetupFont/lib/settingsManager/settingsManager.svelte.ts
View File

@@ -128,7 +128,9 @@ export class TypographySettingsManager {
// This handles the "Multiplier" logic specifically for the Font Size Control
$effect(() => {
const ctrl = this.#controls.get('font_size')?.instance;
if (!ctrl) return;
if (!ctrl) {
return;
}
// If the user moves the slider/clicks buttons in the UI:
// We update the baseSize (User Intent)
@@ -147,10 +149,18 @@ export class TypographySettingsManager {
* Gets initial value for a control from storage or defaults
*/
#getInitialValue(id: string, saved: TypographySettings): number {
if (id === 'font_size') return saved.fontSize * this.#multiplier;
if (id === 'font_weight') return saved.fontWeight;
if (id === 'line_height') return saved.lineHeight;
if (id === 'letter_spacing') return saved.letterSpacing;
if (id === 'font_size') {
return saved.fontSize * this.#multiplier;
}
if (id === 'font_weight') {
return saved.fontWeight;
}
if (id === 'line_height') {
return saved.lineHeight;
}
if (id === 'letter_spacing') {
return saved.letterSpacing;
}
return 0;
}
@@ -165,7 +175,9 @@ export class TypographySettingsManager {
* Updates the multiplier and recalculates dependent control values
*/
set multiplier(value: number) {
if (this.#multiplier === value) return;
if (this.#multiplier === value) {
return;
}
this.#multiplier = value;
// When multiplier changes, we must update the Font Size Control's display value
@@ -192,7 +204,9 @@ export class TypographySettingsManager {
set baseSize(val: number) {
this.#baseSize = val;
const ctrl = this.#controls.get('font_size')?.instance;
if (ctrl) ctrl.value = val * this.#multiplier;
if (ctrl) {
ctrl.value = val * this.#multiplier;
}
}
/**
@@ -268,9 +282,15 @@ export class TypographySettingsManager {
// Map storage key to control id
const key = c.id.replace('_', '') as keyof TypographySettings;
// Simplified for brevity, you'd map these properly:
if (c.id === 'font_weight') c.instance.value = defaults.fontWeight;
if (c.id === 'line_height') c.instance.value = defaults.lineHeight;
if (c.id === 'letter_spacing') c.instance.value = defaults.letterSpacing;
if (c.id === 'font_weight') {
c.instance.value = defaults.fontWeight;
}
if (c.id === 'line_height') {
c.instance.value = defaults.lineHeight;
}
if (c.id === 'letter_spacing') {
c.instance.value = defaults.letterSpacing;
}
}
});
}

4
src/features/SetupFont/ui/TypographyMenu/TypographyMenu.svelte
View File

@@ -48,7 +48,9 @@ let isOpen = $state(false);
* Sets the common font size multiplier based on the current responsive state.
*/
$effect(() => {
if (!responsive) return;
if (!responsive) {
return;
}
switch (true) {
case responsive.isMobile:
typographySettingsStore.multiplier = MULTIPLIER_S;

20
src/shared/lib/helpers/CharacterComparisonEngine/CharacterComparisonEngine.svelte.ts
View File

@@ -171,7 +171,9 @@ export class CharacterComparisonEngine {
for (let sIdx = start.segmentIndex; sIdx <= end.segmentIndex; sIdx++) {
const segmentText = this.#preparedA!.segments[sIdx];
if (segmentText === undefined) continue;
if (segmentText === undefined) {
continue;
}
// PERFORMANCE: Reuse segmenter results if possible, but for now just optimize the loop
const graphemes = Array.from(this.#segmenter.segment(segmentText), s => s.segment);
@@ -242,7 +244,9 @@ export class CharacterComparisonEngine {
const line = this.#lastResult.lines[lineIndex];
const char = line.chars[charIndex];
if (!char) return { proximity: 0, isPast: false };
if (!char) {
return { proximity: 0, isPast: false };
}
// Center the comparison on the unified width
// In the UI, lines are centered. So we need to calculate the global X.
@@ -279,9 +283,15 @@ export class CharacterComparisonEngine {
unified.breakableFitAdvances = intA.breakableFitAdvances.map((advA: number[] | null, i: number) => {
const advB = intB.breakableFitAdvances[i];
if (!advA && !advB) return null;
if (!advA) return advB;
if (!advB) return advA;
if (!advA && !advB) {
return null;
}
if (!advA) {
return advB;
}
if (!advB) {
return advA;
}
return advA.map((w: number, j: number) => Math.max(w, advB[j]));
});

4
src/shared/lib/helpers/TextLayoutEngine/TextLayoutEngine.svelte.ts
View File

@@ -127,7 +127,9 @@ export class TextLayoutEngine {
// Both cursors are grapheme-level: start is inclusive, end is exclusive.
for (let sIdx = start.segmentIndex; sIdx <= end.segmentIndex; sIdx++) {
const segmentText = prepared.segments[sIdx];
if (segmentText === undefined) continue;
if (segmentText === undefined) {
continue;
}
const graphemes = Array.from(this.#segmenter.segment(segmentText), s => s.segment);
const advances = breakableFitAdvances[sIdx];

4
src/shared/lib/helpers/createResponsiveManager/createResponsiveManager.svelte.ts
View File

@@ -150,7 +150,9 @@ export function createResponsiveManager(customBreakpoints?: Partial<Breakpoints>
* @returns Cleanup function to remove listeners
*/
function init() {
if (typeof window === 'undefined') return;
if (typeof window === 'undefined') {
return;
}
const handleResize = () => {
width = window.innerWidth;

32
src/shared/lib/helpers/createVirtualizer/createVirtualizer.svelte.ts
View File

@@ -175,7 +175,9 @@ export function createVirtualizer<T>(
const { count, data } = options;
// Implicit dependency
const v = _version;
if (count === 0 || containerHeight === 0 || !data) return [];
if (count === 0 || containerHeight === 0 || !data) {
return [];
}
const overscan = options.overscan ?? 5;
@@ -264,7 +266,9 @@ export function createVirtualizer<T>(
containerHeight = window.innerHeight;
const handleScroll = () => {
if (rafId !== null) return;
if (rafId !== null) {
return;
}
rafId = requestAnimationFrame(() => {
// Get current position of element relative to viewport
@@ -323,7 +327,9 @@ export function createVirtualizer<T>(
};
const resizeObserver = new ResizeObserver(([entry]) => {
if (entry) containerHeight = entry.contentRect.height;
if (entry) {
containerHeight = entry.contentRect.height;
}
});
node.addEventListener('scroll', handleScroll, { passive: true });
@@ -423,7 +429,9 @@ export function createVirtualizer<T>(
* ```
*/
function scrollToIndex(index: number, align: 'start' | 'center' | 'end' | 'auto' = 'auto') {
if (!elementRef || index < 0 || index >= options.count) return;
if (!elementRef || index < 0 || index >= options.count) {
return;
}
const itemStart = offsets[index];
const itemSize = measuredSizes[index] ?? options.estimateSize(index);
@@ -431,16 +439,24 @@ export function createVirtualizer<T>(
const { useWindowScroll } = optionsGetter();
if (useWindowScroll) {
if (align === 'center') target = itemStart - window.innerHeight / 2 + itemSize / 2;
if (align === 'end') target = itemStart - window.innerHeight + itemSize;
if (align === 'center') {
target = itemStart - window.innerHeight / 2 + itemSize / 2;
}
if (align === 'end') {
target = itemStart - window.innerHeight + itemSize;
}
// Add container offset to target to get absolute document position
const absoluteTarget = target + elementOffsetTop;
window.scrollTo({ top: absoluteTarget, behavior: 'smooth' });
} else {
if (align === 'center') target = itemStart - containerHeight / 2 + itemSize / 2;
if (align === 'end') target = itemStart - containerHeight + itemSize;
if (align === 'center') {
target = itemStart - containerHeight / 2 + itemSize / 2;
}
if (align === 'end') {
target = itemStart - containerHeight + itemSize;
}
elementRef.scrollTo({ top: target, behavior: 'smooth' });
}

4
src/shared/lib/utils/smoothScroll/smoothScroll.ts
View File

@@ -18,7 +18,9 @@ export function smoothScroll(node: HTMLAnchorElement) {
event.preventDefault();
const hash = node.getAttribute('href');
if (!hash || hash === '#') return;
if (!hash || hash === '#') {
return;
}
const targetElement = document.querySelector(hash);

4
src/shared/lib/utils/throttle/throttle.ts
View File

@@ -35,7 +35,9 @@ export function throttle<T extends (...args: any[]) => any>(
fn(...args);
} else {
// Schedule for end of wait period (trailing edge)
if (timeoutId) clearTimeout(timeoutId);
if (timeoutId) {
clearTimeout(timeoutId);
}
timeoutId = setTimeout(() => {
lastCall = Date.now();
fn(...args);

4
src/shared/ui/ComboControl/ComboControl.svelte
View File

@@ -66,7 +66,9 @@ let open = $state(false);
// Smart value formatting matching the Figma design
const formattedValue = $derived(() => {
const v = control.value;
if (Number.isInteger(v)) return String(v);
if (Number.isInteger(v)) {
return String(v);
}
return control.step < 0.1 ? v.toFixed(2) : v.toFixed(1);
});

4
src/shared/ui/PerspectivePlan/PerspectivePlan.svelte
View File

@@ -61,7 +61,9 @@ const style = $derived.by(() => {
// Calculate horizontal constraints based on region
const regionStyleStr = $derived(() => {
if (region === 'full') return '';
if (region === 'full') {
return '';
}
const side = region === 'left' ? 'left' : 'right';
return `position: absolute; ${side}: 0; width: ${regionWidth}%; top: 0; bottom: 0;`;
});

4
src/shared/ui/VirtualList/VirtualList.svelte
View File

@@ -136,7 +136,9 @@ const estimatedTotalSize = $derived.by(() => {
// Add estimated size for unloaded rows
const unloadedRows = totalRows - rowCount;
if (unloadedRows <= 0) return loadedSize;
if (unloadedRows <= 0) {
return loadedSize;
}
// Estimate the size of unloaded rows
const estimateFn = typeof itemHeight === 'function'

40
src/widgets/ComparisonView/model/stores/comparisonStore.svelte.ts
View File

@@ -95,16 +95,22 @@ export class ComparisonStore {
// Effect 1: Sync batch results → fontA / fontB
$effect(() => {
const fonts = this.#batchStore.fonts;
if (fonts.length === 0) return;
if (fonts.length === 0) {
return;
}
const { fontAId: aId, fontBId: bId } = storage.value;
if (aId) {
const fa = fonts.find(f => f.id === aId);
if (fa) this.#fontA = fa;
if (fa) {
this.#fontA = fa;
}
}
if (bId) {
const fb = fonts.find(f => f.id === bId);
if (fb) this.#fontB = fb;
if (fb) {
this.#fontB = fb;
}
}
});
@@ -114,7 +120,9 @@ export class ComparisonStore {
const fb = this.#fontB;
const weight = typographySettingsStore.weight;
if (!fa || !fb) return;
if (!fa || !fb) {
return;
}
const configs: FontLoadRequestConfig[] = [];
[fa, fb].forEach(f => {
@@ -138,7 +146,9 @@ export class ComparisonStore {
// Effect 3: Set default fonts when storage is empty
$effect(() => {
if (this.#fontA && this.#fontB) return;
if (this.#fontA && this.#fontB) {
return;
}
const fonts = fontStore.fonts;
if (fonts.length >= 2) {
@@ -156,11 +166,19 @@ export class ComparisonStore {
const fa = this.#fontA;
const fb = this.#fontB;
const w = typographySettingsStore.weight;
if (fa) appliedFontsManager.pin(fa.id, w, fa.features?.isVariable);
if (fb) appliedFontsManager.pin(fb.id, w, fb.features?.isVariable);
if (fa) {
appliedFontsManager.pin(fa.id, w, fa.features?.isVariable);
}
if (fb) {
appliedFontsManager.pin(fb.id, w, fb.features?.isVariable);
}
return () => {
if (fa) appliedFontsManager.unpin(fa.id, w, fa.features?.isVariable);
if (fb) appliedFontsManager.unpin(fb.id, w, fb.features?.isVariable);
if (fa) {
appliedFontsManager.unpin(fa.id, w, fa.features?.isVariable);
}
if (fb) {
appliedFontsManager.unpin(fb.id, w, fb.features?.isVariable);
}
};
});
});
@@ -183,7 +201,9 @@ export class ComparisonStore {
const fontAName = this.#fontA?.name;
const fontBName = this.#fontB?.name;
if (!fontAName || !fontBName) return;
if (!fontAName || !fontBName) {
return;
}
const fontAString = `${weight} ${size}px "${fontAName}"`;
const fontBString = `${weight} ${size}px "${fontBName}"`;

4
src/widgets/ComparisonView/ui/Character/Character.svelte
View File

@@ -35,7 +35,9 @@ const displayChar = $derived(char === ' ' ? '\u00A0' : char);
const targetFont = $derived(isPast ? fontA?.name ?? '' : fontB?.name ?? '');
$effect(() => {
if (!targetFont || slotFonts[slot] === targetFont) return;
if (!targetFont || slotFonts[slot] === targetFont) {
return;
}
const next = slot === 0 ? 1 : 0;
slotFonts[next] = targetFont;
slot = next;

12
src/widgets/ComparisonView/ui/SliderArea/SliderArea.svelte
View File

@@ -65,7 +65,9 @@ const sliderSpring = new Spring(50, {
const sliderPos = $derived(sliderSpring.current);
function handleMove(e: PointerEvent) {
if (!isDragging || !container) return;
if (!isDragging || !container) {
return;
}
const rect = container.getBoundingClientRect();
const x = Math.max(0, Math.min(e.clientX - rect.left, rect.width));
const percentage = (x / rect.width) * 100;
@@ -87,7 +89,9 @@ $effect(() => {
});
$effect(() => {
if (!responsive) return;
if (!responsive) {
return;
}
switch (true) {
case responsive.isMobile:
typography.multiplier = 0.5;
@@ -143,7 +147,9 @@ $effect(() => {
});
$effect(() => {
if (typeof window === 'undefined') return;
if (typeof window === 'undefined') {
return;
}
const handleResize = () => {
if (container && fontA && fontB) {
const width = container.offsetWidth;

4
src/widgets/SampleList/ui/SampleList/SampleList.svelte
View File

@@ -46,7 +46,9 @@ let isAboveMiddle = $state(false);
let containerWidth = $state(0);
const checkPosition = throttle(() => {
if (!wrapper) return;
if (!wrapper) {
return;
}
const rect = wrapper.getBoundingClientRect();
const viewportMiddle = innerHeight / 2;