@fuzdev/fuz_ui 0.206.7 → 0.206.8

package/src/lib/contextmenu_state.svelte.ts

@@ -1,16 +1,16 @@
-import {onDestroy, type Snippet} from 'svelte';
-import type {Result} from '@fuzdev/fuz_util/result.ts';
-import {is_promise} from '@fuzdev/fuz_util/async.ts';
-import {BROWSER, DEV} from 'esm-env';
-import type {SvelteHTMLElements} from 'svelte/elements';
-import {EMPTY_OBJECT} from '@fuzdev/fuz_util/object.ts';
-import type {Attachment} from 'svelte/attachments';
-
-import {Dimensions} from './dimensions.svelte.ts';
-import {create_context} from './context_helpers.ts';
-import {url_to_root_relative} from './library_helpers.ts';
-import {icon_copy} from './icons.ts';
-import type {SvgData} from './svg.ts';
+import { onDestroy, type Snippet } from 'svelte';
+import type { Result } from '@fuzdev/fuz_util/result.ts';
+import { is_promise } from '@fuzdev/fuz_util/async.ts';
+import { BROWSER, DEV } from 'esm-env';
+import type { SvelteHTMLElements } from 'svelte/elements';
+import { EMPTY_OBJECT } from '@fuzdev/fuz_util/object.ts';
+import type { Attachment } from 'svelte/attachments';
+
+import { Dimensions } from './dimensions.svelte.ts';
+import { create_context } from './context_helpers.ts';
+import { url_to_root_relative } from './library_helpers.ts';
+import { icon_copy } from './icons.ts';
+import type { SvgData } from './svg.ts';
 
 export const contextmenu_context = create_context<() => ContextmenuState>();
 
@@ -21,14 +21,12 @@ export const contextmenu_dimensions_context = create_context(() => new Dimension
 export type ContextmenuParams =
 	| Snippet
 	// TODO maybe this should be generic?
-	| {snippet: 'link'; props: {href: string; icon?: string}}
-	| {snippet: 'text'; props: {content: string; icon: SvgData | string; run: ContextmenuRun}}
-	| {snippet: 'separator'; props: SvelteHTMLElements['li']};
+	| { snippet: 'link'; props: { href: string; icon?: string } }
+	| { snippet: 'text'; props: { content: string; icon: SvgData | string; run: ContextmenuRun } }
+	| { snippet: 'separator'; props: SvelteHTMLElements['li'] };
 
 export type ContextmenuActivateResult =
-	| void
-	| undefined
-	| Result<{close?: boolean}, {message?: string}>;
+	void | undefined | Result<{ close?: boolean }, { message?: string }>;
 
 export type ItemState = SubmenuState | EntryState;
 
@@ -47,7 +45,7 @@ export class EntryState {
 	constructor(
 		menu: SubmenuState | RootMenuState,
 		run: () => ContextmenuRun,
-		disabled: () => boolean = () => false,
+		disabled: () => boolean = () => false
 	) {
 		this.menu = menu;
 		this.run = run;
@@ -124,7 +122,7 @@ export type ContextmenuRun = () => ContextmenuActivateResult | Promise<Contextme
 
 /** Extracts a string `message` property from a thrown value or failed result, if present. */
 const to_error_message = (value: unknown): string | undefined => {
-	const message = (value as {message?: unknown} | null | undefined)?.message;
+	const message = (value as { message?: unknown } | null | undefined)?.message;
 	return typeof message === 'string' ? message : undefined;
 };
 
@@ -193,7 +191,7 @@ export class ContextmenuState {
 	});
 
 	constructor(options: ContextmenuStateOptions = EMPTY_OBJECT) {
-		const {layout} = options;
+		const { layout } = options;
 
 		this.has_custom_layout = !!layout;
 		this.layout = layout ?? new Dimensions();
@@ -203,7 +201,7 @@ export class ContextmenuState {
 		params: Array<ContextmenuParams>,
 		x: number,
 		y: number,
-		target?: HTMLElement | SVGElement,
+		target?: HTMLElement | SVGElement
 	): void {
 		this.#clear_selections();
 		this.opened = true;
@@ -311,7 +309,7 @@ export class ContextmenuState {
 					(err) => {
 						if (promise !== item.promise) return;
 						this.#handle_error(item, to_error_message(err));
-					},
+					}
 				)
 				.finally(() => {
 					if (promise !== item.promise) return;
@@ -411,7 +409,7 @@ export class ContextmenuState {
 	}
 
 	select_last(): void {
-		const {items} = this.selections.at(-1)?.menu ?? this.root_menu;
+		const { items } = this.selections.at(-1)?.menu ?? this.root_menu;
 		if (!items.length) return;
 		this.select(items.at(-1)!);
 	}
@@ -462,7 +460,7 @@ const contextmenu_params_by_element: WeakMap<
  */
 export const contextmenu_attachment =
 	(
-		params: ContextmenuParams | Array<ContextmenuParams> | null | undefined,
+		params: ContextmenuParams | Array<ContextmenuParams> | null | undefined
 	): Attachment<HTMLElement | SVGElement> =>
 	(el): undefined | (() => void) => {
 		if (params == null) return;
@@ -500,13 +498,13 @@ export const contextmenu_open = (
 	x: number,
 	y: number,
 	contextmenu: ContextmenuState,
-	options?: ContextmenuOpenOptions,
+	options?: ContextmenuOpenOptions
 ): boolean => {
 	const {
 		link_enabled = true,
 		text_enabled = true,
 		separator_enabled = true,
-		vibrate = true,
+		vibrate = true
 	} = options ?? EMPTY_OBJECT;
 
 	const params = contextmenu_query_params(target)?.filter(
@@ -514,7 +512,7 @@ export const contextmenu_open = (
 			typeof p === 'function' ||
 			((p.snippet !== 'link' || link_enabled) &&
 				(p.snippet !== 'text' || text_enabled) &&
-				(p.snippet !== 'separator' || separator_enabled)),
+				(p.snippet !== 'separator' || separator_enabled))
 	);
 
 	// No-op if empty
@@ -534,7 +532,7 @@ export const contextmenu_open = (
 };
 
 const contextmenu_query_params = (
-	target: HTMLElement | SVGElement,
+	target: HTMLElement | SVGElement
 ): null | Array<ContextmenuParams> => {
 	let params: null | Array<ContextmenuParams> = null;
 	// crawl DOM for contextmenu entries
@@ -555,7 +553,7 @@ const contextmenu_query_params = (
 			(params ??= []).push({
 				snippet: 'link',
 				// anchor elements have the full url, but we want the slash-prefixed/absolute/root-relative version
-				props: {href: url_to_root_relative((el as HTMLAnchorElement).href)},
+				props: { href: url_to_root_relative((el as HTMLAnchorElement).href) }
 			});
 		}
 		el = el.parentElement;
@@ -571,8 +569,8 @@ const contextmenu_query_params = (
 					icon: icon_copy,
 					run: async () => {
 						await navigator.clipboard.writeText(text);
-					},
-				},
+					}
+				}
 			});
 		}
 	}
@@ -603,7 +601,7 @@ export const contextmenu_check_global_root = (get_scoped: () => boolean): void =
 				console.error(
 					`Detected multiple non-scoped contextmenu roots (${non_scoped_roots.size} mounted). ` +
 						'Only one global contextmenu root should be active at a time. ' +
-						'Are you missing a `scoped` attribute?',
+						'Are you missing a `scoped` attribute?'
 				);
 			}
 		}

package/src/lib/csp.ts

@@ -1,4 +1,4 @@
-import type {Defined} from '@fuzdev/fuz_util/types.ts';
+import type { Defined } from '@fuzdev/fuz_util/types.ts';
 
 // TODO schemas, but I may be moving to ArkType from Zod if precompilation looks good
 
@@ -87,12 +87,12 @@ export interface CreateCspDirectivesOptions {
  * Things like rendering to a string are out of scope and left to SvelteKit.
  */
 export const create_csp_directives = (options: CreateCspDirectivesOptions = {}): CspDirectives => {
-	const {replace_defaults = csp_directive_value_defaults, extend, overrides} = options;
+	const { replace_defaults = csp_directive_value_defaults, extend, overrides } = options;
 
 	if (replace_defaults === null) {
 		throw new Error(
 			`Invalid value 'null' for options.replace_defaults. ` +
-				`Omit the option to use library defaults, or pass {} to start with no directives.`,
+				`Omit the option to use library defaults, or pass {} to start with no directives.`
 		);
 	}
 
@@ -114,7 +114,7 @@ export const create_csp_directives = (options: CreateCspDirectivesOptions = {}):
 		if (value === null) {
 			throw new Error(
 				`Invalid value 'null' for directive '${directive}' in options.replace_defaults. ` +
-					`Omit the key instead, or use \`overrides: { '${directive}': null }\` to remove.`,
+					`Omit the key instead, or use \`overrides: { '${directive}': null }\` to remove.`
 			);
 		}
 
@@ -135,14 +135,12 @@ export const create_csp_directives = (options: CreateCspDirectivesOptions = {}):
 					throw new Error(
 						`Cannot extend directive '${directive}' with null. ` +
 							`extend can only append sources — to remove a directive from the output, ` +
-							`use \`overrides: { '${directive}': null }\`.`,
+							`use \`overrides: { '${directive}': null }\`.`
 					);
 				}
 				if (!Array.isArray(value)) {
 					throw new Error(
-						`Cannot extend directive '${directive}': value must be an array of sources, got ${
-							typeof value
-						}.`,
+						`Cannot extend directive '${directive}': value must be an array of sources, got ${typeof value}.`
 					);
 				}
 				if (!value.length) return;
@@ -153,7 +151,7 @@ export const create_csp_directives = (options: CreateCspDirectivesOptions = {}):
 							`The pipeline runs replace_defaults → extend → overrides, so an \`overrides\` ` +
 							`entry for '${directive}' cannot rescue this — extend sees the ['none'] starting ` +
 							`value first. Opt in via \`replace_defaults: { '${directive}': [...] }\` or move ` +
-							`the sources into \`overrides: { '${directive}': [...] }\`.`,
+							`the sources into \`overrides: { '${directive}': [...] }\`.`
 					);
 				}
 				if (current === undefined) {
@@ -184,13 +182,13 @@ export const create_csp_directives = (options: CreateCspDirectivesOptions = {}):
 		if (!Array.isArray(value)) {
 			throw new Error(
 				`Directive '${key}' has an invalid value: expected an array of sources or a boolean, ` +
-					`got ${value === null ? 'null' : typeof value}.`,
+					`got ${value === null ? 'null' : typeof value}.`
 			);
 		}
 		if (value.length === 0) {
 			throw new Error(
 				`Directive '${key}' has an empty array. ` +
-					`Use ['none'] to forbid all sources, or omit the directive entirely.`,
+					`Use ['none'] to forbid all sources, or omit the directive entirely.`
 			);
 		}
 		// Element-level type check — the `CspSource` template-string type gates this at the
@@ -202,14 +200,14 @@ export const create_csp_directives = (options: CreateCspDirectivesOptions = {}):
 				throw new Error(
 					`Directive '${key}' has a non-string source at index ${i}: got ${
 						v === null ? 'null' : typeof v
-					}.`,
+					}.`
 				);
 			}
 		}
 		if (value.length > 1 && (value as Array<unknown>).includes('none')) {
 			throw new Error(
 				`Directive '${key}' has 'none' alongside other tokens (${value.join(', ')}). ` +
-					`'none' must appear alone in CSP.`,
+					`'none' must appear alone in CSP.`
 			);
 		}
 	}
@@ -241,7 +239,7 @@ const is_none = (value: unknown): boolean =>
 const for_each_directive = <V>(
 	source: Record<string, V>,
 	source_label: 'replace_defaults' | 'extend' | 'overrides',
-	fn: (directive: CspDirective, value: V) => void,
+	fn: (directive: CspDirective, value: V) => void
 ): void => {
 	if (source === null || typeof source !== 'object') {
 		const got = source === null ? 'null' : typeof source;
@@ -294,7 +292,7 @@ export const csp_directive_value_defaults: Partial<{
 	'worker-src': ['self', 'blob:', 'wasm-unsafe-eval'], // Web workers
 	'object-src': ['none'], // Block plugins (Flash, Java, etc.)
 	'base-uri': ['none'], // Prevent base tag hijacking
-	'upgrade-insecure-requests': true, // Upgrade http to https
+	'upgrade-insecure-requests': true // Upgrade http to https
 };
 
 export interface CspDirectiveSpec {
@@ -328,128 +326,128 @@ export const csp_directive_specs: Array<CspDirectiveSpec> = [
 			'child-src',
 			'connect-src',
 			'worker-src',
-			'object-src',
-		],
+			'object-src'
+		]
 	},
 	{
 		name: 'script-src',
 		fallback: ['default-src'],
-		fallback_of: ['script-src-elem', 'script-src-attr', 'worker-src'],
+		fallback_of: ['script-src-elem', 'script-src-attr', 'worker-src']
 	},
 	{
 		name: 'script-src-elem',
 		fallback: ['script-src', 'default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'script-src-attr',
 		fallback: ['script-src', 'default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'style-src',
 		fallback: ['default-src'],
-		fallback_of: ['style-src-elem', 'style-src-attr'],
+		fallback_of: ['style-src-elem', 'style-src-attr']
 	},
 	{
 		name: 'style-src-elem',
 		fallback: ['style-src', 'default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'style-src-attr',
 		fallback: ['style-src', 'default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'img-src',
 		fallback: ['default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'media-src',
 		fallback: ['default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'font-src',
 		fallback: ['default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'manifest-src',
 		fallback: ['default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'child-src',
 		fallback: ['default-src'],
-		fallback_of: ['frame-src', 'worker-src'],
+		fallback_of: ['frame-src', 'worker-src']
 	},
 	{
 		name: 'connect-src',
 		fallback: ['default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'frame-src',
 		fallback: ['child-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'frame-ancestors',
 		fallback: null,
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'form-action',
 		fallback: null,
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'worker-src',
 		fallback: ['child-src', 'script-src', 'default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'object-src',
 		fallback: ['default-src'],
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'base-uri',
 		fallback: null,
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'upgrade-insecure-requests',
 		fallback: null,
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'report-to',
 		fallback: null,
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'require-trusted-types-for',
 		fallback: null,
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'trusted-types',
 		fallback: null,
-		fallback_of: null,
+		fallback_of: null
 	},
 	{
 		name: 'sandbox',
 		fallback: null,
-		fallback_of: null,
-	},
+		fallback_of: null
+	}
 ];
 
 export const csp_directive_spec_by_name: Map<CspDirective, CspDirectiveSpec> = new Map(
-	csp_directive_specs.map((s) => [s.name, s]),
+	csp_directive_specs.map((s) => [s.name, s])
 );
 
 // CSP types from SvelteKit, adapted with changes from @sveltejs/kit/src/types/private.d.ts
@@ -482,12 +480,7 @@ export const csp_directive_spec_by_name: Map<CspDirective, CspDirectiveSpec> = n
 // SOFTWARE.
 export type CspActionSource = 'strict-dynamic' | 'report-sample';
 export type CspBaseSource =
-	| 'self'
-	| 'unsafe-eval'
-	| 'unsafe-hashes'
-	| 'unsafe-inline'
-	| 'wasm-unsafe-eval'
-	| 'none';
+	'self' | 'unsafe-eval' | 'unsafe-hashes' | 'unsafe-inline' | 'wasm-unsafe-eval' | 'none';
 export type CspCryptoSource = `${'nonce' | 'sha256' | 'sha384' | 'sha512'}-${string}`;
 export type CspFrameSource = CspHostSource | CspSchemeSource | 'self' | 'none';
 export type CspHostNameScheme = `${string}.${string}` | 'localhost';
@@ -495,12 +488,7 @@ export type CspHostSource = `${CspHostProtocolSchemes}${CspHostNameScheme}${CspP
 export type CspHostProtocolSchemes = `${string}://` | '';
 export type CspPortScheme = `:${number}` | '' | ':*';
 export type CspSchemeSource =
-	| 'http:'
-	| 'https:'
-	| 'data:'
-	| 'mediastream:'
-	| 'blob:'
-	| 'filesystem:';
+	'http:' | 'https:' | 'data:' | 'mediastream:' | 'blob:' | 'filesystem:';
 export type CspSource = CspHostSource | CspSchemeSource | CspCryptoSource | CspBaseSource;
 export type CspSources = Array<CspSource>;
 

package/src/lib/csp_of_fuzdev.ts

@@ -1,4 +1,4 @@
-import type {CspDirectives} from './csp.ts';
+import type { CspDirectives } from './csp.ts';
 
 /**
  * Per-directive sources that allow full interop between fuzdev/sister sites
@@ -19,7 +19,7 @@ export const csp_directives_of_fuzdev: Partial<CspDirectives> = {
 	'font-src': ['https://*.fuz.dev/', 'https://*.zzz.software/'],
 	'connect-src': ['https://*.fuz.dev/', 'https://*.zzz.software/'],
 	'frame-src': ['https://*.fuz.dev/', 'https://*.zzz.software/'],
-	'frame-ancestors': ['https://*.fuz.dev/', 'https://*.zzz.software/'],
+	'frame-ancestors': ['https://*.fuz.dev/', 'https://*.zzz.software/']
 	// `child-src` is intentionally omitted — it defaults to `['none']`, and `extend` cannot
 	// append to a `'none'`-valued directive. Including it here would break the common
 	// `create_csp_directives({extend: [csp_directives_of_fuzdev]})` call. `frame-src` is its