@glasshome/widget-sdk 1.17.0 → 1.17.1

package/dist/index.js

@@ -2829,7 +2829,7 @@ function Qa() {
 //#region src/version.ts
 var $a = {
 	name: "@glasshome/widget-sdk",
-	version: "1.17.0",
+	version: "1.17.1",
 	description: "SDK for building GlassHome dashboard widgets with SolidJS",
 	keywords: [
 		"glasshome",

package/dist/vite/index.d.ts

@@ -67,6 +67,7 @@ export declare function createUiImportTracker(warned?: Set<string>): {
     /** Offending files this run has not reported yet; marks them reported. */
     take(): string[];
 };
+export declare function dropSelfReferencingVars(css: string): string;
 /**
  * Widgets render inside a closed shadow root in the host, which cuts them off
  * from the host document stylesheet. Every widget bundle must therefore carry

package/dist/vite/index.js

@@ -6,27 +6,27 @@ import { createRequire as m } from "node:module";
 import { dirname as h, join as g, relative as _, resolve as v, sep as y } from "node:path";
 import { fileURLToPath as b } from "node:url";
 import ee from "@tailwindcss/vite";
-import { spawn as te, spawnSync as x } from "node:child_process";
+import { spawn as te, spawnSync as ne } from "node:child_process";
 //#region src/vite/introspect-session.ts
-var S = 262144e3, C = 3e4, ne = 3e3;
-function w(e) {
+var x = 262144e3, S = 3e4, re = 3e3;
+function C(e) {
 	let t = h(b(import.meta.url));
 	return [g(t, `${e}.js`), g(t, `${e}.ts`)].find((e) => s(e)) ?? null;
 }
-function T(e) {
-	let t = w("introspect");
+function w(e) {
+	let t = C("introspect");
 	if (!t) return {
 		ok: !1,
 		reason: "introspect not found next to the sdk"
 	};
-	let n = x(process.execPath, [
+	let n = ne(process.execPath, [
 		"--conditions",
 		"browser",
 		t,
 		e
 	], {
 		encoding: "utf-8",
-		timeout: C
+		timeout: S
 	});
 	if (n.error) return {
 		ok: !1,
@@ -48,16 +48,16 @@ function T(e) {
 		};
 	}
 }
-function re() {
+function ie() {
 	return {
-		introspect: async (e) => T(e),
+		introspect: async (e) => w(e),
 		dispose: async () => {},
 		childPid: null
 	};
 }
-function ie(e) {
-	if (process.env.GLASSHOME_WIDGET_NO_WORKER === "1") return re();
-	let t = e?.rssLimitBytes ?? S, n = e?.timeoutMs ?? C, r = e?.slowMs ?? ne, i = null, a = !1, o = 0, s = Promise.resolve();
+function ae(e) {
+	if (process.env.GLASSHOME_WIDGET_NO_WORKER === "1") return ie();
+	let t = e?.rssLimitBytes ?? x, n = e?.timeoutMs ?? S, r = e?.slowMs ?? re, i = null, a = !1, o = 0, s = Promise.resolve();
 	function c(e, t) {
 		for (let n of e.pending.values()) n({
 			ok: !1,
@@ -128,7 +128,7 @@ function ie(e) {
 			ok: !1,
 			reason: "introspect session disposed"
 		};
-		let t = w("introspect-worker");
+		let t = C("introspect-worker");
 		if (!t) return {
 			ok: !1,
 			reason: "introspect-worker not found next to the sdk"
@@ -186,20 +186,20 @@ function ie(e) {
 }
 //#endregion
 //#region src/vite/index.ts
-var E = 2;
-function D(e) {
-	if (Array.isArray(e)) return `[${e.map(D).join(",")}]`;
+var T = 2;
+function E(e) {
+	if (Array.isArray(e)) return `[${e.map(E).join(",")}]`;
 	if (typeof e == "object" && e) {
 		let t = e;
-		return `{${Object.keys(t).sort().filter((e) => t[e] !== void 0).map((e) => `${JSON.stringify(e)}:${D(t[e])}`).join(",")}}`;
+		return `{${Object.keys(t).sort().filter((e) => t[e] !== void 0).map((e) => `${JSON.stringify(e)}:${E(t[e])}`).join(",")}}`;
 	}
 	return JSON.stringify(e) ?? "null";
 }
-function ae(e) {
-	return o("sha256").update(D(e)).digest("hex").slice(0, 16);
+function oe(e) {
+	return o("sha256").update(E(e)).digest("hex").slice(0, 16);
 }
-var oe = 20;
-async function O(e, t) {
+var se = 20;
+async function D(e, t) {
 	if (e === void 0) return;
 	let n;
 	try {
@@ -219,7 +219,7 @@ async function O(e, t) {
 	let a = i.error.issues.map((e) => `  examples${e.path.length ? `[${e.path.join("][")}]` : ""}: ${e.message}`).join("\n");
 	throw Error(`[widget-sdk] Invalid \`examples\` for "${t}":\n${a}\nEach example needs a \`config\` object and a \`size\` of whole positive tiles, and at most 20 are rendered.`);
 }
-function k(e, t) {
+function O(e, t) {
 	if (!e?.length) return;
 	let n = e.map((e) => {
 		let t = e.label ? `"${e.label}"` : `#${e.index}`;
@@ -227,7 +227,7 @@ function k(e, t) {
 	}).join("\n");
 	throw Error(`[widget-sdk] Example config rejected by "${t}"'s own configSchema:\n${n}\nEach example's \`config\` must be a config the widget would actually accept, or its preview renders empty.`);
 }
-var se = [
+var ce = [
 	"schema",
 	"defaultConfig",
 	"examples",
@@ -240,20 +240,20 @@ var se = [
 	"minSize",
 	"maxSize"
 ];
-function ce(e, t, n) {
+function le(e, t, n) {
 	let r = l(e, "utf-8"), i = JSON.parse(r), a = {
 		...t.manifest ?? {},
 		schema: n
 	};
-	for (let e of se) a[e] !== void 0 && (i[e] = a[e]);
+	for (let e of ce) a[e] !== void 0 && (i[e] = a[e]);
 	let o = `${JSON.stringify(i, null, 2)}\n`;
 	o !== r && p(e, o);
 }
-var le = /import\s*(\{[^}]*\}|\*\s*as\s+[\w$]+)\s*from\s*["']@glasshome\/widget-sdk["']/g, ue = /import\(\s*["']@glasshome\/widget-sdk["']\s*\)/;
-function A(e) {
+var ue = /import\s*(\{[^}]*\}|\*\s*as\s+[\w$]+)\s*from\s*["']@glasshome\/widget-sdk["']/g, de = /import\(\s*["']@glasshome\/widget-sdk["']\s*\)/;
+function k(e) {
 	let t = /* @__PURE__ */ new Set();
-	ue.test(e) && t.add("*");
-	for (let [, n = ""] of e.matchAll(le)) {
+	de.test(e) && t.add("*");
+	for (let [, n = ""] of e.matchAll(ue)) {
 		if (!n.startsWith("{")) {
 			t.add("*");
 			continue;
@@ -265,27 +265,27 @@ function A(e) {
 	}
 	return t;
 }
-var j = { useDaylight: "sun.sun" };
-function M(e, t, n) {
-	let r = A(e);
-	for (let [e, a] of Object.entries(j)) {
+var A = { useDaylight: "sun.sun" };
+function j(e, t, n) {
+	let r = k(e);
+	for (let [e, a] of Object.entries(A)) {
 		if (!r.has(e) && !r.has("*") || i(t, a)) continue;
 		let o = a.split(".")[0];
 		throw Error(`[widget-sdk] "${n}" uses ${e}(), which reads ${a}, but its capabilities grant no read of it.\n  Add { "domain": "${o}", "access": "read" } to capabilities, so the homeowner is told before installing.`);
 	}
 }
-async function N(e) {
+async function M(e) {
 	if (!s(e.outFile)) return;
-	let t = e.session ? await e.session.introspect(e.outFile) : T(e.outFile);
+	let t = e.session ? await e.session.introspect(e.outFile) : w(e.outFile);
 	if (!t.ok) throw Error(`[widget-sdk] Could not read "${e.widgetName}" to check it: ${t.reason}\n  Its examples and config schema could not be validated, so the build cannot continue.
   This usually means the bundle throws while being imported.`);
 	let n = t.value, r = n.manifest?.name ?? e.widgetName;
-	await O(n.manifest?.examples, r), k(n.exampleConfigIssues, r);
+	await D(n.manifest?.examples, r), O(n.exampleConfigIssues, r);
 	let i = n.jsonSchema, a = e.manifestPath && s(e.manifestPath) ? e.manifestPath : null;
-	i && a && ce(a, n, i);
+	i && a && le(a, n, i);
 	let o = a ? JSON.parse(l(a, "utf-8")).capabilities : n.manifest?.capabilities;
-	if (M(l(e.outFile, "utf-8"), o ?? [], r), !i) return;
-	let c = ae(i), u = n.manifest?.configVersion ?? null, d = n.manifest?.name ?? e.widgetName, f = s(e.hashFile) ? l(e.hashFile, "utf-8") : null;
+	if (j(l(e.outFile, "utf-8"), o ?? [], r), !i) return;
+	let c = oe(i), u = n.manifest?.configVersion ?? null, d = n.manifest?.name ?? e.widgetName, f = s(e.hashFile) ? l(e.hashFile, "utf-8") : null;
 	if (f !== null) {
 		let t = f.trim(), n = null;
 		if (t.startsWith("{")) try {
@@ -293,55 +293,55 @@ async function N(e) {
 		} catch {
 			n = null;
 		}
-		if (n && n.hashVersion === E) {
+		if (n && n.hashVersion === T) {
 			if (n.hash !== c && n.configVersion === u) throw Error(`[widget-sdk] Config schema shape changed for "${d}" without a configVersion bump. Bump configVersion in defineWidget (currently ${u ?? "unset"}) or revert the schema change, then rebuild. Recorded in ${e.hashFile}`);
-		} else console.warn(`[widget-sdk] Schema shape record for "${d}" was written by an older SDK, so it cannot be compared. Re-recording it under hash format ${E}. This build is not checked for a missing configVersion bump; the next one is. (${e.hashFile})`);
+		} else console.warn(`[widget-sdk] Schema shape record for "${d}" was written by an older SDK, so it cannot be compared. Re-recording it under hash format ${T}. This build is not checked for a missing configVersion bump; the next one is. (${e.hashFile})`);
 	}
 	let m = `${JSON.stringify({
 		hash: c,
 		configVersion: u,
-		hashVersion: E
+		hashVersion: T
 	})}\n`;
 	m !== f && p(e.hashFile, m);
 }
-var de = "virtual:glasshome-widget", P = "\0virtual:glasshome-widget", fe = "/@glasshome/preview";
-function F(e) {
+var fe = "virtual:glasshome-widget", N = "\0virtual:glasshome-widget", pe = "/@glasshome/preview";
+function P(e) {
 	return y === "\\" ? e.split(y).join("/") : e;
 }
-function I() {
+function F() {
 	let e = b(import.meta.url);
 	return v(h(e), "../../preview");
 }
-function L(e) {
+function I(e) {
 	return r(e);
 }
-var R = /\.(ts|tsx|js|jsx)$/, z = /from\s+["']@glasshome\/sync-layer(\/[^"']*)?["']/;
-function B(e, t) {
-	let n = F(e).split("?")[0] ?? "";
-	return n.includes("/node_modules/") || !R.test(n) ? !1 : z.test(t);
+var L = /\.(ts|tsx|js|jsx)$/, R = /from\s+["']@glasshome\/sync-layer(\/[^"']*)?["']/;
+function z(e, t) {
+	let n = P(e).split("?")[0] ?? "";
+	return n.includes("/node_modules/") || !L.test(n) ? !1 : R.test(t);
 }
-function V() {
+function B() {
 	return {
 		name: "glasshome-widget:sync-layer-guard",
 		apply: "build",
 		enforce: "pre",
 		transform(e, t) {
-			if (B(t, e)) throw Error(`Widgets must not import "@glasshome/sync-layer" directly (imported by ${F(_(process.cwd(), t.split("?")[0] ?? t))}). Import the equivalent hook from "@glasshome/widget-sdk" instead (e.g. useEntity, useEntities, useService).`);
+			if (z(t, e)) throw Error(`Widgets must not import "@glasshome/sync-layer" directly (imported by ${P(_(process.cwd(), t.split("?")[0] ?? t))}). Import the equivalent hook from "@glasshome/widget-sdk" instead (e.g. useEntity, useEntities, useService).`);
 			return null;
 		}
 	};
 }
-function H(t, n) {
-	let r = F(t).split("?")[0] ?? "";
-	if (r.includes("/node_modules/") || !R.test(r)) return !1;
+function V(t, n) {
+	let r = P(t).split("?")[0] ?? "";
+	if (r.includes("/node_modules/") || !L.test(r)) return !1;
 	let i = e.find((e) => e.id === "direct-ui-import");
 	return i?.sourcePattern ? new RegExp(i.sourcePattern).test(n) : !1;
 }
-function U(e = /* @__PURE__ */ new Set()) {
+function H(e = /* @__PURE__ */ new Set()) {
 	let t = /* @__PURE__ */ new Set();
 	return {
 		scan(e, n) {
-			H(e, n) && t.add(F(_(process.cwd(), e.split("?")[0] ?? e)));
+			V(e, n) && t.add(P(_(process.cwd(), e.split("?")[0] ?? e)));
 		},
 		take() {
 			let n = [...t].filter((t) => !e.has(t));
@@ -350,8 +350,8 @@ function U(e = /* @__PURE__ */ new Set()) {
 		}
 	};
 }
-function W(n) {
-	let r = U(n);
+function U(n) {
+	let r = H(n);
 	return {
 		name: "glasshome-widget:ui-import-guard",
 		apply: "build",
@@ -367,15 +367,15 @@ function W(n) {
 		}
 	};
 }
-var pe = "node_modules/.cache/glasshome-widgets";
-function G(e) {
+var me = "node_modules/.cache/glasshome-widgets";
+function W(e) {
 	try {
 		return m(g(process.cwd(), "package.json")).resolve(e);
 	} catch {
 		return null;
 	}
 }
-var me = [
+var he = [
 	"--radius",
 	"--background",
 	"--foreground",
@@ -385,12 +385,16 @@ var me = [
 	"--muted",
 	"--accent"
 ];
+function G(e) {
+	return e.replace(/(?<=[{;])\s*(--[\w-]+)\s*:\s*var\(\s*\1\s*\)\s*(;|(?=\}))/g, "");
+}
 function K(e, t) {
 	let n = g(e, `${t}.css`);
 	if (!s(n)) return;
-	let r = l(n, "utf-8");
-	for (let e of r.matchAll(/:host[^{]*\{([^}]*)\}/g)) {
-		let n = e[1] ?? "", r = me.find((e) => n.includes(`${e}:`));
+	let r = l(n, "utf-8"), i = G(r);
+	i !== r && p(n, i);
+	for (let e of i.matchAll(/:host[^{]*\{([^}]*)\}/g)) {
+		let n = e[1] ?? "", r = he.find((e) => n.includes(`${e}:`));
 		if (r) throw Error(`[glasshome-widget] "${t}.css" defines theme variable "${r}" on :host. Theme variables must inherit from the document so widgets follow the household theme — never re-scope them into the widget's shadow root.`);
 	}
 }
@@ -399,11 +403,11 @@ function q(e, t) {
 	return [r, ...u(n, { withFileTypes: !0 }).filter((e) => e.isDirectory()).map((e) => g(n, e.name)).filter((e) => !i.has(e))];
 }
 function J(e, t, n, r) {
-	let i = v(e, pe);
+	let i = v(e, me);
 	c(i, { recursive: !0 });
-	let a = G("@glasshome/ui/styles");
+	let a = W("@glasshome/ui/styles");
 	if (!a) throw Error("[widget-sdk] @glasshome/ui is required to build widgets (it provides the theme every GlassHome widget ships with). Add it to your widget's dependencies.");
-	let o = v(h(a), "../.."), l = G("@glasshome/widget-sdk/tailwind-sources"), u = l ? h(l) : null, d = [
+	let o = v(h(a), "../.."), l = W("@glasshome/widget-sdk/tailwind-sources"), u = l ? h(l) : null, d = [
 		g(o, "src"),
 		g(o, "dist"),
 		...u ? [g(u, "src"), g(u, "dist")] : [],
@@ -413,7 +417,7 @@ function J(e, t, n, r) {
 		"@import \"tailwindcss\" source(none);",
 		"@import \"tw-animate-css\";",
 		"@import \"@glasshome/ui/styles/theme\";",
-		...d.map((e) => `@source "${F(e)}";`),
+		...d.map((e) => `@source "${P(e)}";`),
 		"@custom-variant dark {",
 		"  &:is(.dark *) { @slot }",
 		"  :host(.dark) & { @slot }",
@@ -422,8 +426,8 @@ function J(e, t, n, r) {
 	].join("\n"));
 	let m = v(i, `${t}.entry.ts`);
 	return p(m, [
-		`import "${F(f)}";`,
-		`export { default } from "${F(n)}";`,
+		`import "${P(f)}";`,
+		`export { default } from "${P(n)}";`,
 		""
 	].join("\n")), m;
 }
@@ -491,8 +495,8 @@ async function $(e) {
 		plugins: [
 			...X(),
 			...e?.plugins ?? [],
-			V(),
-			W(o)
+			B(),
+			U(o)
 		],
 		...e?.viteConfig,
 		css: {
@@ -506,14 +510,14 @@ async function $(e) {
 				fileName: s.name,
 				cssFileName: s.name
 			},
-			rollupOptions: { external: L },
+			rollupOptions: { external: I },
 			outDir: i,
 			emptyOutDir: !1,
 			copyPublicDir: !1,
 			...e?.viteConfig?.build
 		},
 		logLevel: "warn"
-	}), K(i, s.name), await N({
+	}), K(i, s.name), await M({
 		outFile: g(i, `${s.name}.js`),
 		hashFile: g(h(s.entry), ".schema-hash"),
 		widgetName: s.name,
@@ -522,7 +526,7 @@ async function $(e) {
 	});
 	Q(r, i);
 }
-function he(e) {
+function ge(e) {
 	let t = e?.entry ?? "src/index.tsx", n = {
 		name: "glasshome-widget:build",
 		apply: "build",
@@ -537,7 +541,7 @@ function he(e) {
 						fileName: "index",
 						cssFileName: "index"
 					},
-					rollupOptions: { external: L }
+					rollupOptions: { external: I }
 				}
 			};
 		}
@@ -546,7 +550,7 @@ function he(e) {
 		apply: "serve",
 		enforce: "pre",
 		config() {
-			let e = I(), t = process.cwd();
+			let e = F(), t = process.cwd();
 			return { server: { fs: { allow: [
 				e,
 				t,
@@ -554,7 +558,7 @@ function he(e) {
 			] } } };
 		},
 		configureServer(e) {
-			let t = I(), n = g(t, "preview.html");
+			let t = F(), n = g(t, "preview.html");
 			e.middlewares.use(async (t, r, i) => {
 				if (t.url === "/" || t.url === "/index.html") try {
 					let i = l(n, "utf-8");
@@ -566,20 +570,20 @@ function he(e) {
 			});
 		},
 		resolveId(e) {
-			if (e === fe) {
-				let e = I();
-				return F(g(e, "host.tsx"));
+			if (e === pe) {
+				let e = F();
+				return P(g(e, "host.tsx"));
 			}
-			if (e === de) return P;
+			if (e === fe) return N;
 		},
 		load(e) {
-			if (e === P) return `export { default } from "${F(v(process.cwd(), t))}";`;
+			if (e === N) return `export { default } from "${P(v(process.cwd(), t))}";`;
 		}
 	}, i = {
 		name: "glasshome-widget:schema",
 		apply: "build",
 		async closeBundle() {
-			K(v(process.cwd(), "dist"), "index"), await N({
+			K(v(process.cwd(), "dist"), "index"), await M({
 				outFile: v(process.cwd(), "dist", "index.js"),
 				hashFile: v(process.cwd(), ".schema-hash"),
 				widgetName: "index",
@@ -590,13 +594,13 @@ function he(e) {
 	return [
 		...X(),
 		n,
-		V(),
-		W(),
+		B(),
+		U(),
 		i,
 		r
 	];
 }
-function ge(e) {
+function _e(e) {
 	let t = e?.srcDir ?? "src", n = e?.outDir ?? "dist", r = [];
 	return [{
 		name: "glasshome-widgets:build",
@@ -624,4 +628,4 @@ function ge(e) {
 	}];
 }
 //#endregion
-export { j as HOOK_READS, oe as MAX_EXAMPLES, M as assertHookReadsDeclared, $ as buildWidgets, ie as createIntrospectSession, U as createUiImportTracker, Z as discoverWidgets, Q as generateRegistry, he as glasshomeWidget, ge as glasshomeWidgets, T as introspectOnce, B as isDirectSyncLayerImportSource, H as isDirectUiImportSource, L as isWidgetExternal, N as runSchemaGuard, A as sdkImportsOf, q as widgetProjectScanDirs };
+export { A as HOOK_READS, se as MAX_EXAMPLES, j as assertHookReadsDeclared, $ as buildWidgets, ae as createIntrospectSession, H as createUiImportTracker, Z as discoverWidgets, G as dropSelfReferencingVars, Q as generateRegistry, ge as glasshomeWidget, _e as glasshomeWidgets, w as introspectOnce, z as isDirectSyncLayerImportSource, V as isDirectUiImportSource, I as isWidgetExternal, M as runSchemaGuard, k as sdkImportsOf, q as widgetProjectScanDirs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glasshome/widget-sdk",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "SDK for building GlassHome dashboard widgets with SolidJS",
   "keywords": [
     "glasshome",