@ilha/astro 0.3.2 → 0.3.4

package/dist/client.d.ts

@@ -1,2 +1,15 @@
-declare const _default: (element: HTMLElement) => (Component: unknown, props: Record<string, unknown>, slotted: Record<string, string>, _metadata: Record<string, string>) => Promise<void>;
-export default _default;
+import type { View } from "ilha";
+/** JSON-serializable data — Astro props cross the client boundary serialized. */
+type Json = string | number | boolean | null | Json[] | {
+    [key: string]: Json;
+};
+/** Props passed to a hydrated island: Astro's serialized props plus slotted
+ * content re-keyed as `children`. */
+type IslandProps = Record<string, Json>;
+export type { IslandProps };
+/** An ilha component: a function of props producing a view. The integration's
+ * `check()` validates the component at build time, so no runtime guard is
+ * needed here. */
+type IslandComponent = (props: IslandProps) => View | undefined | Promise<View | undefined>;
+declare const mountIsland: (element: HTMLElement) => (Component: IslandComponent, props: IslandProps, slotted: Record<string, string>, _metadata: Record<string, string>) => void;
+export default mountIsland;

package/dist/client.js

@@ -1,8 +1,7 @@
 import { mount } from "ilha";
 
 //#region src/client.ts
-var client_default = (element) => async (Component, props, slotted, _metadata) => {
-	if (typeof Component !== "function") return;
+const mountIsland = (element) => (Component, props, slotted, _metadata) => {
 	const merged = { ...props };
 	for (const [name, value] of Object.entries(slotted ?? {})) merged[name === "default" ? "children" : name] = value;
 	const nested = element.querySelector("[data-ilha]");
@@ -11,4 +10,4 @@ var client_default = (element) => async (Component, props, slotted, _metadata) =
 };
 
 //#endregion
-export { client_default as default };
+export { mountIsland as default };

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export interface IlhaIntegrationOptions {
     include?: string | string[];
     exclude?: string | string[];
 }
-export declare function getRenderer(): AstroRenderer;
+export declare const getRenderer: () => AstroRenderer;
 /**
  * Vite's dependency optimizer otherwise inlines peer `ilha` into prebundled
  * consumers (Areia, etc.) while the app loads workspace/linked `ilha` via
@@ -11,17 +11,17 @@ export declare function getRenderer(): AstroRenderer;
  *
  * `resolve.dedupe` + `optimizeDeps.exclude` keep a single module instance.
  */
-export declare function getViteConfig(options?: IlhaIntegrationOptions): {
+export declare const getViteConfig: (options?: IlhaIntegrationOptions) => {
+    optimizeDeps: {
+        exclude: string[];
+    };
     plugins: {
+        load(id: string): string | undefined;
         name: string;
         resolveId(id: string): "\0virtual:@ilha/astro/options" | undefined;
-        load(id: string): string | undefined;
     }[];
     resolve: {
         dedupe: string[];
     };
-    optimizeDeps: {
-        exclude: string[];
-    };
 };
 export default function ilhaIntegration(options?: IlhaIntegrationOptions): AstroIntegration;

package/dist/index.js

@@ -1,44 +1,40 @@
 //#region src/index.ts
 const OPTIONS_MODULE = "virtual:@ilha/astro/options";
-function globToRegExp(pattern) {
+const objectTag = (value) => Object.prototype.toString.call(value);
+const isString = (value) => objectTag(value) === "[object String]";
+const globToRegExp = (pattern) => {
 	let source = "^";
-	for (let i = 0; i < pattern.length; i++) {
+	for (let i = 0; i < pattern.length; i += 1) {
 		const char = pattern[i];
 		if (char === "*") {
 			if (pattern[i + 1] === "*") {
-				i++;
+				i += 1;
 				if (pattern[i + 1] === "/") {
-					i++;
+					i += 1;
 					source += "(?:.*/)?";
 				} else source += ".*";
 			} else source += "[^/]*";
 		} else if (char === "?") source += "[^/]";
-		else source += char.replace(/[\\^$.*+?()[\]{}|]/g, "\\$&");
+		else source += char.replaceAll(/[\\^$.*+?()[\]{}|]/gu, "\\$&");
 	}
-	return new RegExp(`${source}$`);
-}
-function patternList(patterns) {
-	return (typeof patterns === "string" ? [patterns] : patterns ?? []).map(globToRegExp).join(",");
-}
-function optionsPlugin(options) {
-	return {
-		name: "@ilha/astro:options",
-		resolveId(id) {
-			return id === OPTIONS_MODULE ? `\0${OPTIONS_MODULE}` : void 0;
-		},
-		load(id) {
-			if (id !== `\0${OPTIONS_MODULE}`) return;
-			return `const include=[${patternList(options.include)}],exclude=[${patternList(options.exclude)}];export default id=>(!include.length||include.some(pattern=>pattern.test(id)))&&!exclude.some(pattern=>pattern.test(id));`;
-		}
-	};
-}
-function getRenderer() {
-	return {
-		name: "@ilha/astro",
-		clientEntrypoint: "@ilha/astro/client",
-		serverEntrypoint: "@ilha/astro/server"
-	};
-}
+	return new RegExp(`${source}$`, "u");
+};
+const patternList = (patterns) => (isString(patterns) ? [patterns] : patterns ?? []).map(globToRegExp).join(",");
+const optionsPlugin = (options) => ({
+	load(id) {
+		if (id !== `\0${OPTIONS_MODULE}`) return;
+		return `const include=[${patternList(options.include)}],exclude=[${patternList(options.exclude)}];export default id=>(!include.length||include.some(pattern=>pattern.test(id)))&&!exclude.some(pattern=>pattern.test(id));`;
+	},
+	name: "@ilha/astro:options",
+	resolveId(id) {
+		return id === OPTIONS_MODULE ? `\0${OPTIONS_MODULE}` : void 0;
+	}
+});
+const getRenderer = () => ({
+	clientEntrypoint: "@ilha/astro/client",
+	name: "@ilha/astro",
+	serverEntrypoint: "@ilha/astro/server"
+});
 /**
 * Vite's dependency optimizer otherwise inlines peer `ilha` into prebundled
 * consumers (Areia, etc.) while the app loads workspace/linked `ilha` via
@@ -46,20 +42,18 @@ function getRenderer() {
 *
 * `resolve.dedupe` + `optimizeDeps.exclude` keep a single module instance.
 */
-function getViteConfig(options = {}) {
-	return {
-		plugins: [optionsPlugin(options)],
-		resolve: { dedupe: ["ilha"] },
-		optimizeDeps: { exclude: ["ilha"] }
-	};
-}
+const getViteConfig = (options = {}) => ({
+	optimizeDeps: { exclude: ["ilha"] },
+	plugins: [optionsPlugin(options)],
+	resolve: { dedupe: ["ilha"] }
+});
 function ilhaIntegration(options = {}) {
 	return {
-		name: "@ilha/astro",
 		hooks: { "astro:config:setup": ({ addRenderer, updateConfig }) => {
 			addRenderer(getRenderer());
 			updateConfig({ vite: getViteConfig(options) });
-		} }
+		} },
+		name: "@ilha/astro"
 	};
 }
 

package/dist/server.js

@@ -2,42 +2,55 @@ import { renderToString } from "ilha";
 
 //#region src/server.ts
 let componentFilter;
-function getComponentFilter() {
-	return componentFilter ??= import("virtual:@ilha/astro/options").then(({ default: filter }) => filter).catch(() => () => true);
-}
-function isAstroRenderable(value) {
-	return !!value && typeof value === "object" && typeof value.render === "function";
-}
-async function resolveAstroRenderable(value) {
+const objectTag = (value) => Object.prototype.toString.call(value);
+const isFunction = (value) => {
+	const tag = objectTag(value);
+	return tag === "[object Function]" || tag === "[object AsyncFunction]" || tag === "[object GeneratorFunction]";
+};
+const getComponentFilter = async () => {
+	componentFilter ??= (async () => {
+		try {
+			const { default: filter } = await import("virtual:@ilha/astro/options");
+			return filter;
+		} catch {
+			return () => true;
+		}
+	})();
+	return await componentFilter;
+};
+const isAstroRenderable = (value) => value !== null && "render" in new Object(value);
+const resolveAstroRenderable = async (value) => {
 	let out = "";
 	await value.render({ write(chunk) {
-		if (chunk != null) out += String(chunk);
+		out += chunk;
 	} });
 	return out;
-}
-async function resolvePropValue(value) {
+};
+const resolvePropValue = async (value) => {
 	if (isAstroRenderable(value)) return await resolveAstroRenderable(value);
 	if (Array.isArray(value)) return Promise.all(value.map(resolvePropValue));
 	return value;
-}
-async function mergeProps(props, slots) {
-	const resolved = {};
-	for (const [key, value] of Object.entries(props)) resolved[key] = await resolvePropValue(value);
+};
+const mergeProps = async (props, slots) => {
+	const entries = Object.entries(props).filter((entry) => entry[1] !== void 0);
+	const resolvedValues = await Promise.all(entries.map(([, value]) => resolvePropValue(value)));
+	const resolved = Object.fromEntries(entries.map(([key], index) => [key, resolvedValues[index]]));
 	for (const [name, value] of Object.entries(slots)) resolved[name === "default" ? "children" : name] = value;
 	return resolved;
-}
-async function check(Component, _props, _slots, metadata) {
+};
+const check = async (Component, _props, _slots, metadata) => {
 	if (metadata?.componentUrl && !(await getComponentFilter())(metadata.componentUrl)) return false;
-	return typeof Component === "function";
-}
-async function renderToStaticMarkup(Component, props, slots, metadata) {
-	if (typeof Component !== "function") throw new Error(`[@ilha/astro] Unable to render "${metadata?.displayName ?? "component"}" — expected a function.`);
+	return isFunction(Component);
+};
+const renderToStaticMarkup = async (Component, props, slots, metadata) => {
+	if (!isFunction(Component)) throw new TypeError(`[@ilha/astro] Unable to render "${metadata?.displayName ?? "component"}" — expected a function.`);
 	const merged = await mergeProps(props, slots);
-	return { html: await renderToString(() => Component(merged)) };
-}
+	const render = Component;
+	return { html: await renderToString(() => render(merged)) };
+};
 const renderer = {
-	name: "@ilha/astro",
 	check,
+	name: "@ilha/astro",
 	renderToStaticMarkup
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ilha/astro",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "description": "Astro integration for Ilha islands",
   "keywords": [
     "astro-component",
@@ -55,10 +55,10 @@
   },
   "devDependencies": {
     "astro": "^7.2.9",
-    "ilha": "0.14.2"
+    "ilha": "0.14.4"
   },
   "peerDependencies": {
     "astro": "^7.2.9",
-    "ilha": "^0.14.2"
+    "ilha": "^0.14.4"
   }
 }