@useavalon/avalon 0.1.11 → 0.1.13

package/src/build/prop-extractors/svelte.ts

@@ -1,194 +1,194 @@
-import { FALLBACK_PROPS, type PropExtractionResult } from "./vue.ts";
-
-/**
- * Extract props from a Svelte component source string.
- *
- * Supports three patterns:
- *   1. `let { ... }: { ... } = $props()` — inline type literal
- *   2. `let { ... }: TypeName = $props()` or `let name: TypeName = $props()`
- *      — named type resolved from an interface/type declaration in the script block
- *   3. `export let name: type` — Svelte 4 style, collected into a type literal
- *
- * Never throws — returns fallback on any failure.
- */
-export function extractSvelteProps(source: string): PropExtractionResult {
-	try {
-		const scriptContent = extractScriptContent(source);
-		if (scriptContent === null) {
-			return { propsType: FALLBACK_PROPS, fallback: true };
-		}
-
-		// Try $props() patterns first (Svelte 5)
-		const propsResult = extractFromDollarProps(scriptContent);
-		if (propsResult !== null) {
-			return { propsType: propsResult, fallback: false };
-		}
-
-		// Try export let pattern (Svelte 4)
-		const exportLetResult = extractFromExportLet(scriptContent);
-		if (exportLetResult !== null) {
-			return { propsType: exportLetResult, fallback: false };
-		}
-
-		return { propsType: FALLBACK_PROPS, fallback: true };
-	} catch {
-		console.warn(
-			"[avalon] Failed to extract Svelte props — falling back to Record<string, unknown>",
-		);
-		return { propsType: FALLBACK_PROPS, fallback: true };
-	}
-}
-
-/**
- * Extract the content of the `<script>` or `<script lang="ts">` block.
- * Returns `null` if no script block is found.
- */
-function extractScriptContent(source: string): string | null {
-	const scriptRegex = /<script\b[^>]*>([\s\S]*?)<\/script>/i;
-	const match = new RegExp(scriptRegex).exec(source);
-	return match ? match[1] : null;
-}
-
-/**
- * Extract props type from `$props()` call patterns.
- *
- * Handles:
- *   - `let { ... }: { ... } = $props()` (inline type literal)
- *   - `let { ... }: TypeName = $props()` (named type, destructuring)
- *   - `let name: TypeName = $props()` (named type, non-destructuring)
- */
-function extractFromDollarProps(scriptContent: string): string | null {
-	// Match: let <binding> : <type> = $props()
-	// The binding can be `{ ... }` (destructuring) or a simple identifier
-	const propsCallRegex =
-		/let\s+(?:\{[^}]*\}|\w+)\s*:\s*([\s\S]*?)\s*=\s*\$props\s*\(\s*\)/;
-	const match = new RegExp(propsCallRegex).exec(scriptContent);
-	if (!match) {
-		return null;
-	}
-
-	const typeAnnotation = match[1].trim();
-	if (typeAnnotation.length === 0) {
-		return null;
-	}
-
-	// If it starts with `{`, it's an inline type literal — return as-is
-	if (typeAnnotation.startsWith("{")) {
-		// Validate balanced braces
-		if (!areBracesBalanced(typeAnnotation)) {
-			console.warn(
-				"[avalon] Unbalanced braces in Svelte $props() type — falling back",
-			);
-			return null;
-		}
-		return typeAnnotation;
-	}
-
-	// Otherwise it's a named type — resolve from interface/type in the script
-	return resolveNamedType(scriptContent, typeAnnotation);
-}
-
-/**
- * Resolve a named type (interface or type alias) from the script content.
- * Returns the body as a type literal string, or null if not found.
- */
-function resolveNamedType(
-	scriptContent: string,
-	typeName: string,
-): string | null {
-	// Try interface first: `interface TypeName { ... }`
-	const interfaceRegex = new RegExp(
-		String.raw`interface\s+${escapeRegex(typeName)}\s*\{`,
-	);
-	const interfaceMatch = interfaceRegex.exec(scriptContent);
-	if (interfaceMatch) {
-		const startIdx = interfaceMatch.index + interfaceMatch[0].length - 1; // position of `{`
-		const body = extractBalancedBraces(scriptContent, startIdx);
-		if (body !== null) {
-			return body;
-		}
-	}
-
-	// Try type alias: `type TypeName = { ... }`
-	const typeAliasRegex = new RegExp(
-		String.raw`type\s+${escapeRegex(typeName)}\s*=\s*\{`,
-	);
-	const typeAliasMatch = typeAliasRegex.exec(scriptContent);
-	if (typeAliasMatch) {
-		const startIdx =
-			typeAliasMatch.index + typeAliasMatch[0].length - 1; // position of `{`
-		const body = extractBalancedBraces(scriptContent, startIdx);
-		if (body !== null) {
-			return body;
-		}
-	}
-
-	return null;
-}
-
-/**
- * Extract a balanced `{ ... }` block starting at the given index.
- * Returns the full string including the outer braces, or null if unbalanced.
- */
-function extractBalancedBraces(source: string, startIdx: number): string | null {
-	if (source[startIdx] !== "{") {
-		return null;
-	}
-
-	let depth = 0;
-	let i = startIdx;
-
-	while (i < source.length) {
-		if (source[i] === "{") {
-			depth++;
-		} else if (source[i] === "}") {
-			depth--;
-			if (depth === 0) {
-				return source.slice(startIdx, i + 1).trim();
-			}
-		}
-		i++;
-	}
-
-	return null; // unbalanced
-}
-
-/**
- * Extract props from `export let` declarations (Svelte 4 pattern).
- * Collects all `export let name: type` and builds a type literal.
- */
-function extractFromExportLet(scriptContent: string): string | null {
-	const exportLetRegex = /export\s+let\s+(\w+)\s*:\s*([^;=]+)/g;
-	const props: string[] = [];
-	let match: RegExpExecArray | null;
-
-	while ((match = exportLetRegex.exec(scriptContent)) !== null) {
-		const name = match[1].trim();
-		const type = match[2].trim();
-		if (name && type) {
-			props.push(`${name}: ${type}`);
-		}
-	}
-
-	if (props.length === 0) {
-		return null;
-	}
-
-	return `{ ${props.join("; ")} }`;
-}
-
-/** Check if braces are balanced in a string */
-function areBracesBalanced(str: string): boolean {
-	let depth = 0;
-	for (const ch of str) {
-		if (ch === "{") depth++;
-		else if (ch === "}") depth--;
-		if (depth < 0) return false;
-	}
-	return depth === 0;
-}
-
-/** Escape special regex characters in a string */
-function escapeRegex(str: string): string {
-	return str.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
-}
+import { FALLBACK_PROPS, type PropExtractionResult } from "./vue.ts";
+
+/**
+ * Extract props from a Svelte component source string.
+ *
+ * Supports three patterns:
+ *   1. `let { ... }: { ... } = $props()` — inline type literal
+ *   2. `let { ... }: TypeName = $props()` or `let name: TypeName = $props()`
+ *      — named type resolved from an interface/type declaration in the script block
+ *   3. `export let name: type` — Svelte 4 style, collected into a type literal
+ *
+ * Never throws — returns fallback on any failure.
+ */
+export function extractSvelteProps(source: string): PropExtractionResult {
+	try {
+		const scriptContent = extractScriptContent(source);
+		if (scriptContent === null) {
+			return { propsType: FALLBACK_PROPS, fallback: true };
+		}
+
+		// Try $props() patterns first (Svelte 5)
+		const propsResult = extractFromDollarProps(scriptContent);
+		if (propsResult !== null) {
+			return { propsType: propsResult, fallback: false };
+		}
+
+		// Try export let pattern (Svelte 4)
+		const exportLetResult = extractFromExportLet(scriptContent);
+		if (exportLetResult !== null) {
+			return { propsType: exportLetResult, fallback: false };
+		}
+
+		return { propsType: FALLBACK_PROPS, fallback: true };
+	} catch {
+		console.warn(
+			"[avalon] Failed to extract Svelte props — falling back to Record<string, unknown>",
+		);
+		return { propsType: FALLBACK_PROPS, fallback: true };
+	}
+}
+
+/**
+ * Extract the content of the `<script>` or `<script lang="ts">` block.
+ * Returns `null` if no script block is found.
+ */
+function extractScriptContent(source: string): string | null {
+	const scriptRegex = /<script\b[^>]*>([\s\S]*?)<\/script>/i;
+	const match = new RegExp(scriptRegex).exec(source);
+	return match ? match[1] : null;
+}
+
+/**
+ * Extract props type from `$props()` call patterns.
+ *
+ * Handles:
+ *   - `let { ... }: { ... } = $props()` (inline type literal)
+ *   - `let { ... }: TypeName = $props()` (named type, destructuring)
+ *   - `let name: TypeName = $props()` (named type, non-destructuring)
+ */
+function extractFromDollarProps(scriptContent: string): string | null {
+	// Match: let <binding> : <type> = $props()
+	// The binding can be `{ ... }` (destructuring) or a simple identifier
+	const propsCallRegex =
+		/let\s+(?:\{[^}]*\}|\w+)\s*:\s*([\s\S]*?)\s*=\s*\$props\s*\(\s*\)/;
+	const match = new RegExp(propsCallRegex).exec(scriptContent);
+	if (!match) {
+		return null;
+	}
+
+	const typeAnnotation = match[1].trim();
+	if (typeAnnotation.length === 0) {
+		return null;
+	}
+
+	// If it starts with `{`, it's an inline type literal — return as-is
+	if (typeAnnotation.startsWith("{")) {
+		// Validate balanced braces
+		if (!areBracesBalanced(typeAnnotation)) {
+			console.warn(
+				"[avalon] Unbalanced braces in Svelte $props() type — falling back",
+			);
+			return null;
+		}
+		return typeAnnotation;
+	}
+
+	// Otherwise it's a named type — resolve from interface/type in the script
+	return resolveNamedType(scriptContent, typeAnnotation);
+}
+
+/**
+ * Resolve a named type (interface or type alias) from the script content.
+ * Returns the body as a type literal string, or null if not found.
+ */
+function resolveNamedType(
+	scriptContent: string,
+	typeName: string,
+): string | null {
+	// Try interface first: `interface TypeName { ... }`
+	const interfaceRegex = new RegExp(
+		String.raw`interface\s+${escapeRegex(typeName)}\s*\{`,
+	);
+	const interfaceMatch = interfaceRegex.exec(scriptContent);
+	if (interfaceMatch) {
+		const startIdx = interfaceMatch.index + interfaceMatch[0].length - 1; // position of `{`
+		const body = extractBalancedBraces(scriptContent, startIdx);
+		if (body !== null) {
+			return body;
+		}
+	}
+
+	// Try type alias: `type TypeName = { ... }`
+	const typeAliasRegex = new RegExp(
+		String.raw`type\s+${escapeRegex(typeName)}\s*=\s*\{`,
+	);
+	const typeAliasMatch = typeAliasRegex.exec(scriptContent);
+	if (typeAliasMatch) {
+		const startIdx =
+			typeAliasMatch.index + typeAliasMatch[0].length - 1; // position of `{`
+		const body = extractBalancedBraces(scriptContent, startIdx);
+		if (body !== null) {
+			return body;
+		}
+	}
+
+	return null;
+}
+
+/**
+ * Extract a balanced `{ ... }` block starting at the given index.
+ * Returns the full string including the outer braces, or null if unbalanced.
+ */
+function extractBalancedBraces(source: string, startIdx: number): string | null {
+	if (source[startIdx] !== "{") {
+		return null;
+	}
+
+	let depth = 0;
+	let i = startIdx;
+
+	while (i < source.length) {
+		if (source[i] === "{") {
+			depth++;
+		} else if (source[i] === "}") {
+			depth--;
+			if (depth === 0) {
+				return source.slice(startIdx, i + 1).trim();
+			}
+		}
+		i++;
+	}
+
+	return null; // unbalanced
+}
+
+/**
+ * Extract props from `export let` declarations (Svelte 4 pattern).
+ * Collects all `export let name: type` and builds a type literal.
+ */
+function extractFromExportLet(scriptContent: string): string | null {
+	const exportLetRegex = /export\s+let\s+(\w+)\s*:\s*([^;=]+)/g;
+	const props: string[] = [];
+	let match: RegExpExecArray | null;
+
+	while ((match = exportLetRegex.exec(scriptContent)) !== null) {
+		const name = match[1].trim();
+		const type = match[2].trim();
+		if (name && type) {
+			props.push(`${name}: ${type}`);
+		}
+	}
+
+	if (props.length === 0) {
+		return null;
+	}
+
+	return `{ ${props.join("; ")} }`;
+}
+
+/** Check if braces are balanced in a string */
+function areBracesBalanced(str: string): boolean {
+	let depth = 0;
+	for (const ch of str) {
+		if (ch === "{") depth++;
+		else if (ch === "}") depth--;
+		if (depth < 0) return false;
+	}
+	return depth === 0;
+}
+
+/** Escape special regex characters in a string */
+function escapeRegex(str: string): string {
+	return str.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+}

package/src/build/prop-extractors/vue.ts

@@ -1,111 +1,111 @@
-/** Result of prop extraction */
-export interface PropExtractionResult {
-	/** The TypeScript type literal for props, e.g. "{ count?: number }" */
-	propsType: string;
-	/** Whether extraction succeeded or fell back */
-	fallback: boolean;
-}
-
-/** Fallback props type used when extraction fails or no props are found */
-export const FALLBACK_PROPS = "Record<string, unknown>";
-
-/**
- * Extract props from a Vue SFC source string.
- *
- * Looks for `defineProps<{...}>()` inside a `<script setup>` or
- * `<script setup lang="ts">` block. Uses brace-counting to handle
- * nested types within the angle brackets.
- *
- * Never throws — returns fallback on any failure.
- */
-export function extractVueProps(source: string): PropExtractionResult {
-	try {
-		// 1. Extract the <script setup ...> block content
-		const scriptContent = extractScriptSetupContent(source);
-		if (scriptContent === null) {
-			return { propsType: FALLBACK_PROPS, fallback: true };
-		}
-
-		// 2. Find defineProps<...>() and extract the type argument
-		const propsType = extractDefinePropsType(scriptContent);
-		if (propsType === null) {
-			return { propsType: FALLBACK_PROPS, fallback: true };
-		}
-
-		return { propsType, fallback: false };
-	} catch {
-		console.warn(
-			"[avalon] Failed to extract Vue props — falling back to Record<string, unknown>",
-		);
-		return { propsType: FALLBACK_PROPS, fallback: true };
-	}
-}
-
-/**
- * Extract the content of the `<script setup>` block from a Vue SFC source.
- * Returns `null` if no `<script setup>` block is found.
- */
-function extractScriptSetupContent(source: string): string | null {
-	// Match <script setup> or <script setup lang="ts"> (and other attrs)
-	// The 's' flag makes . match newlines
-	const scriptSetupRegex =
-		/<script\b[^>]*\bsetup\b[^>]*>([\s\S]*?)<\/script>/i;
-	const match = new RegExp(scriptSetupRegex).exec(source);
-	return match ? match[1] : null;
-}
-
-/** Check that `{` and `}` are balanced in a string */
-function hasBracesBalanced(str: string): boolean {
-	let depth = 0;
-	for (const ch of str) {
-		if (ch === "{") depth++;
-		else if (ch === "}") depth--;
-		if (depth < 0) return false;
-	}
-	return depth === 0;
-}
-
-/**
- * Extract the type argument from `defineProps<TYPE>()` using angle-bracket
- * counting to handle nested generics and object types.
- *
- * After extraction, validates that braces are balanced in the result.
- * Returns the trimmed type string, or `null` if not found.
- */
-function extractDefinePropsType(scriptContent: string): string | null {
-	const marker = "defineProps<";
-	const idx = scriptContent.indexOf(marker);
-	if (idx === -1) {
-		return null;
-	}
-
-	const start = idx + marker.length;
-	let depth = 1;
-	let i = start;
-
-	while (i < scriptContent.length && depth > 0) {
-		const ch = scriptContent[i];
-		if (ch === "<") depth++;
-		else if (ch === ">") depth--;
-		if (depth > 0) i++;
-	}
-
-	if (depth !== 0) {
-		console.warn("[avalon] Unbalanced angle brackets in defineProps<...> — falling back");
-		return null;
-	}
-
-	const typeStr = scriptContent.slice(start, i).trim();
-	if (typeStr.length === 0) {
-		return null;
-	}
-
-	if (!hasBracesBalanced(typeStr)) {
-		console.warn("[avalon] Unbalanced braces in defineProps type — falling back");
-		return null;
-	}
-
-	return typeStr;
-}
-
-
+/** Result of prop extraction */
+export interface PropExtractionResult {
+	/** The TypeScript type literal for props, e.g. "{ count?: number }" */
+	propsType: string;
+	/** Whether extraction succeeded or fell back */
+	fallback: boolean;
+}
+
+/** Fallback props type used when extraction fails or no props are found */
+export const FALLBACK_PROPS = "Record<string, unknown>";
+
+/**
+ * Extract props from a Vue SFC source string.
+ *
+ * Looks for `defineProps<{...}>()` inside a `<script setup>` or
+ * `<script setup lang="ts">` block. Uses brace-counting to handle
+ * nested types within the angle brackets.
+ *
+ * Never throws — returns fallback on any failure.
+ */
+export function extractVueProps(source: string): PropExtractionResult {
+	try {
+		// 1. Extract the <script setup ...> block content
+		const scriptContent = extractScriptSetupContent(source);
+		if (scriptContent === null) {
+			return { propsType: FALLBACK_PROPS, fallback: true };
+		}
+
+		// 2. Find defineProps<...>() and extract the type argument
+		const propsType = extractDefinePropsType(scriptContent);
+		if (propsType === null) {
+			return { propsType: FALLBACK_PROPS, fallback: true };
+		}
+
+		return { propsType, fallback: false };
+	} catch {
+		console.warn(
+			"[avalon] Failed to extract Vue props — falling back to Record<string, unknown>",
+		);
+		return { propsType: FALLBACK_PROPS, fallback: true };
+	}
+}
+
+/**
+ * Extract the content of the `<script setup>` block from a Vue SFC source.
+ * Returns `null` if no `<script setup>` block is found.
+ */
+function extractScriptSetupContent(source: string): string | null {
+	// Match <script setup> or <script setup lang="ts"> (and other attrs)
+	// The 's' flag makes . match newlines
+	const scriptSetupRegex =
+		/<script\b[^>]*\bsetup\b[^>]*>([\s\S]*?)<\/script>/i;
+	const match = new RegExp(scriptSetupRegex).exec(source);
+	return match ? match[1] : null;
+}
+
+/** Check that `{` and `}` are balanced in a string */
+function hasBracesBalanced(str: string): boolean {
+	let depth = 0;
+	for (const ch of str) {
+		if (ch === "{") depth++;
+		else if (ch === "}") depth--;
+		if (depth < 0) return false;
+	}
+	return depth === 0;
+}
+
+/**
+ * Extract the type argument from `defineProps<TYPE>()` using angle-bracket
+ * counting to handle nested generics and object types.
+ *
+ * After extraction, validates that braces are balanced in the result.
+ * Returns the trimmed type string, or `null` if not found.
+ */
+function extractDefinePropsType(scriptContent: string): string | null {
+	const marker = "defineProps<";
+	const idx = scriptContent.indexOf(marker);
+	if (idx === -1) {
+		return null;
+	}
+
+	const start = idx + marker.length;
+	let depth = 1;
+	let i = start;
+
+	while (i < scriptContent.length && depth > 0) {
+		const ch = scriptContent[i];
+		if (ch === "<") depth++;
+		else if (ch === ">") depth--;
+		if (depth > 0) i++;
+	}
+
+	if (depth !== 0) {
+		console.warn("[avalon] Unbalanced angle brackets in defineProps<...> — falling back");
+		return null;
+	}
+
+	const typeStr = scriptContent.slice(start, i).trim();
+	if (typeStr.length === 0) {
+		return null;
+	}
+
+	if (!hasBracesBalanced(typeStr)) {
+		console.warn("[avalon] Unbalanced braces in defineProps type — falling back");
+		return null;
+	}
+
+	return typeStr;
+}
+
+