@glasshome/widget-sdk 1.15.0 → 1.15.1

package/dist/index.js

@@ -1507,7 +1507,7 @@ function hr() {
 //#region src/version.ts
 var gr = {
 	name: "@glasshome/widget-sdk",
-	version: "1.15.0",
+	version: "1.15.1",
 	description: "SDK for building GlassHome dashboard widgets with SolidJS",
 	keywords: [
 		"glasshome",

package/dist/vite/index.js

@@ -6,27 +6,27 @@ import { createRequire as p } from "node:module";
 import { dirname as m, join as h, relative as g, resolve as _, sep as v } from "node:path";
 import { fileURLToPath as y } from "node:url";
 import ee from "@tailwindcss/vite";
-import { spawn as te, spawnSync as b } from "node:child_process";
+import { spawn as te, spawnSync as ne } from "node:child_process";
 //#region src/vite/introspect-session.ts
-var ne = 262144e3, x = 3e4, S = 3e3;
-function C(e) {
+var re = 262144e3, b = 3e4, ie = 3e3;
+function x(e) {
 	let t = m(y(import.meta.url));
 	return [h(t, `${e}.js`), h(t, `${e}.ts`)].find((e) => o(e)) ?? null;
 }
-function w(e) {
-	let t = C("introspect");
+function S(e) {
+	let t = x("introspect");
 	if (!t) return {
 		ok: !1,
 		reason: "introspect not found next to the sdk"
 	};
-	let n = b(process.execPath, [
+	let n = ne(process.execPath, [
 		"--conditions",
 		"browser",
 		t,
 		e
 	], {
 		encoding: "utf-8",
-		timeout: x
+		timeout: b
 	});
 	if (n.error) return {
 		ok: !1,
@@ -48,16 +48,16 @@ function w(e) {
 		};
 	}
 }
-function re() {
+function ae() {
 	return {
-		introspect: async (e) => w(e),
+		introspect: async (e) => S(e),
 		dispose: async () => {},
 		childPid: null
 	};
 }
-function ie(e) {
-	if (process.env.GLASSHOME_WIDGET_NO_WORKER === "1") return re();
-	let t = e?.rssLimitBytes ?? ne, n = e?.timeoutMs ?? x, r = e?.slowMs ?? S, i = null, a = !1, o = 0, s = Promise.resolve();
+function C(e) {
+	if (process.env.GLASSHOME_WIDGET_NO_WORKER === "1") return ae();
+	let t = e?.rssLimitBytes ?? re, n = e?.timeoutMs ?? b, r = e?.slowMs ?? ie, 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 = C("introspect-worker");
+		let t = x("introspect-worker");
 		if (!t) return {
 			ok: !1,
 			reason: "introspect-worker not found next to the sdk"
@@ -186,12 +186,20 @@ function ie(e) {
 }
 //#endregion
 //#region src/vite/index.ts
+var w = 2;
 function T(e) {
-	let t = JSON.stringify(e, Object.keys(e).sort());
-	return a("sha256").update(t).digest("hex").slice(0, 16);
+	if (Array.isArray(e)) return `[${e.map(T).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)}:${T(t[e])}`).join(",")}}`;
+	}
+	return JSON.stringify(e) ?? "null";
+}
+function E(e) {
+	return a("sha256").update(T(e)).digest("hex").slice(0, 16);
 }
-var E = 20;
-async function D(e, t) {
+var D = 20;
+async function O(e, t) {
 	if (e === void 0) return;
 	let n;
 	try {
@@ -211,7 +219,7 @@ async function D(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 O(e, t) {
+function k(e, t) {
 	if (!e?.length) return;
 	let n = e.map((e) => {
 		let t = e.label ? `"${e.label}"` : `#${e.index}`;
@@ -219,7 +227,7 @@ function O(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 k = [
+var A = [
 	"schema",
 	"defaultConfig",
 	"examples",
@@ -232,26 +240,26 @@ var k = [
 	"minSize",
 	"maxSize"
 ];
-function A(e, t, n) {
+function j(e, t, n) {
 	let r = c(e, "utf-8"), i = JSON.parse(r), a = {
 		...t.manifest ?? {},
 		schema: n
 	};
-	for (let e of k) a[e] !== void 0 && (i[e] = a[e]);
+	for (let e of A) a[e] !== void 0 && (i[e] = a[e]);
 	let o = `${JSON.stringify(i, null, 2)}\n`;
 	o !== r && f(e, o);
 }
-async function j(e) {
+async function M(e) {
 	if (!o(e.outFile)) return;
-	let t = e.session ? await e.session.introspect(e.outFile) : w(e.outFile);
+	let t = e.session ? await e.session.introspect(e.outFile) : S(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 D(n.manifest?.examples, r), O(n.exampleConfigIssues, r);
+	await O(n.manifest?.examples, r), k(n.exampleConfigIssues, r);
 	let i = n.jsonSchema;
 	if (!i) return;
-	e.manifestPath && o(e.manifestPath) && A(e.manifestPath, n, i);
-	let a = T(i), s = n.manifest?.configVersion ?? null, l = n.manifest?.name ?? e.widgetName, u = o(e.hashFile) ? c(e.hashFile, "utf-8") : null;
+	e.manifestPath && o(e.manifestPath) && j(e.manifestPath, n, i);
+	let a = E(i), s = n.manifest?.configVersion ?? null, l = n.manifest?.name ?? e.widgetName, u = o(e.hashFile) ? c(e.hashFile, "utf-8") : null;
 	if (u !== null) {
 		let t = u.trim(), n = null;
 		if (t.startsWith("{")) try {
@@ -259,54 +267,55 @@ async function j(e) {
 		} catch {
 			n = null;
 		}
-		if (n) {
+		if (n && n.hashVersion === w) {
 			if (n.hash !== a && n.configVersion === s) throw Error(`[widget-sdk] Config schema shape changed for "${l}" without a configVersion bump. Bump configVersion in defineWidget (currently ${s ?? "unset"}) or revert the schema change, then rebuild. Recorded in ${e.hashFile}`);
-		} else t !== a && console.warn(`[widget-sdk] Schema shape changed for "${l}" — verify configVersion was bumped`);
+		} else console.warn(`[widget-sdk] Schema shape record for "${l}" was written by an older SDK, so it cannot be compared. Re-recording it under hash format ${w}. This build is not checked for a missing configVersion bump; the next one is. (${e.hashFile})`);
 	}
 	let d = `${JSON.stringify({
 		hash: a,
-		configVersion: s
+		configVersion: s,
+		hashVersion: w
 	})}\n`;
 	d !== u && f(e.hashFile, d);
 }
-var ae = "virtual:glasshome-widget", M = "\0virtual:glasshome-widget", N = "/@glasshome/preview";
-function P(e) {
+var oe = "virtual:glasshome-widget", N = "\0virtual:glasshome-widget", P = "/@glasshome/preview";
+function F(e) {
 	return v === "\\" ? e.split(v).join("/") : e;
 }
-function F() {
+function I() {
 	let e = y(import.meta.url);
 	return _(m(e), "../../preview");
 }
-function I(e) {
+function L(e) {
 	return r(e);
 }
-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);
+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);
 }
-function B() {
+function V() {
 	return {
 		name: "glasshome-widget:sync-layer-guard",
 		apply: "build",
 		enforce: "pre",
 		transform(e, t) {
-			if (z(t, e)) throw Error(`Widgets must not import "@glasshome/sync-layer" directly (imported by ${P(g(process.cwd(), t.split("?")[0] ?? t))}). Import the equivalent hook from "@glasshome/widget-sdk" instead (e.g. useEntity, useEntities, useService).`);
+			if (B(t, e)) throw Error(`Widgets must not import "@glasshome/sync-layer" directly (imported by ${F(g(process.cwd(), t.split("?")[0] ?? t))}). Import the equivalent hook from "@glasshome/widget-sdk" instead (e.g. useEntity, useEntities, useService).`);
 			return null;
 		}
 	};
 }
-function V(t, n) {
-	let r = P(t).split("?")[0] ?? "";
-	if (r.includes("/node_modules/") || !L.test(r)) return !1;
+function H(t, n) {
+	let r = F(t).split("?")[0] ?? "";
+	if (r.includes("/node_modules/") || !R.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 H(e = /* @__PURE__ */ new Set()) {
+function U(e = /* @__PURE__ */ new Set()) {
 	let t = /* @__PURE__ */ new Set();
 	return {
 		scan(e, n) {
-			V(e, n) && t.add(P(g(process.cwd(), e.split("?")[0] ?? e)));
+			H(e, n) && t.add(F(g(process.cwd(), e.split("?")[0] ?? e)));
 		},
 		take() {
 			let n = [...t].filter((t) => !e.has(t));
@@ -315,8 +324,8 @@ function H(e = /* @__PURE__ */ new Set()) {
 		}
 	};
 }
-function U(n) {
-	let r = H(n);
+function W(n) {
+	let r = U(n);
 	return {
 		name: "glasshome-widget:ui-import-guard",
 		apply: "build",
@@ -332,15 +341,15 @@ function U(n) {
 		}
 	};
 }
-var W = "node_modules/.cache/glasshome-widgets";
-function G(e) {
+var G = "node_modules/.cache/glasshome-widgets";
+function K(e) {
 	try {
 		return p(h(process.cwd(), "package.json")).resolve(e);
 	} catch {
 		return null;
 	}
 }
-var K = [
+var se = [
 	"--radius",
 	"--background",
 	"--foreground",
@@ -355,16 +364,16 @@ function q(e, t) {
 	if (!o(n)) return;
 	let r = c(n, "utf-8");
 	for (let e of r.matchAll(/:host[^{]*\{([^}]*)\}/g)) {
-		let n = e[1] ?? "", r = K.find((e) => n.includes(`${e}:`));
+		let n = e[1] ?? "", r = se.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.`);
 	}
 }
 function J(e, t, n) {
-	let r = _(e, W);
+	let r = _(e, G);
 	s(r, { recursive: !0 });
-	let i = G("@glasshome/ui/styles");
+	let i = K("@glasshome/ui/styles");
 	if (!i) 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 a = _(m(i), "../.."), c = G("@glasshome/widget-sdk/tailwind-sources"), l = c ? m(c) : null, u = [
+	let a = _(m(i), "../.."), c = K("@glasshome/widget-sdk/tailwind-sources"), l = c ? m(c) : null, u = [
 		h(a, "src"),
 		h(a, "dist"),
 		...l ? [h(l, "src"), h(l, "dist")] : [],
@@ -374,7 +383,7 @@ function J(e, t, n) {
 		"@import \"tailwindcss\" source(none);",
 		"@import \"tw-animate-css\";",
 		"@import \"@glasshome/ui/styles/theme\";",
-		...u.map((e) => `@source "${P(e)}";`),
+		...u.map((e) => `@source "${F(e)}";`),
 		"@custom-variant dark {",
 		"  &:is(.dark *) { @slot }",
 		"  :host(.dark) & { @slot }",
@@ -383,8 +392,8 @@ function J(e, t, n) {
 	].join("\n"));
 	let p = _(r, `${t}.entry.ts`);
 	return f(p, [
-		`import "${P(d)}";`,
-		`export { default } from "${P(n)}";`,
+		`import "${F(d)}";`,
+		`export { default } from "${F(n)}";`,
 		""
 	].join("\n")), p;
 }
@@ -452,8 +461,8 @@ async function $(e) {
 		plugins: [
 			...X(),
 			...e?.plugins ?? [],
-			B(),
-			U(c)
+			V(),
+			W(c)
 		],
 		...e?.viteConfig,
 		css: {
@@ -467,14 +476,14 @@ async function $(e) {
 				fileName: r.name,
 				cssFileName: r.name
 			},
-			rollupOptions: { external: I },
+			rollupOptions: { external: L },
 			outDir: i,
 			emptyOutDir: !1,
 			copyPublicDir: !1,
 			...e?.viteConfig?.build
 		},
 		logLevel: "warn"
-	}), q(i, r.name), await j({
+	}), q(i, r.name), await M({
 		outFile: h(i, `${r.name}.js`),
 		hashFile: h(m(r.entry), ".schema-hash"),
 		widgetName: r.name,
@@ -483,7 +492,7 @@ async function $(e) {
 	});
 	Q(r, i);
 }
-function oe(e) {
+function ce(e) {
 	let t = e?.entry ?? "src/index.tsx", n = {
 		name: "glasshome-widget:build",
 		apply: "build",
@@ -498,7 +507,7 @@ function oe(e) {
 						fileName: "index",
 						cssFileName: "index"
 					},
-					rollupOptions: { external: I }
+					rollupOptions: { external: L }
 				}
 			};
 		}
@@ -507,7 +516,7 @@ function oe(e) {
 		apply: "serve",
 		enforce: "pre",
 		config() {
-			let e = F(), t = process.cwd();
+			let e = I(), t = process.cwd();
 			return { server: { fs: { allow: [
 				e,
 				t,
@@ -515,7 +524,7 @@ function oe(e) {
 			] } } };
 		},
 		configureServer(e) {
-			let t = F(), n = h(t, "preview.html");
+			let t = I(), n = h(t, "preview.html");
 			e.middlewares.use(async (t, r, i) => {
 				if (t.url === "/" || t.url === "/index.html") try {
 					let i = c(n, "utf-8");
@@ -527,20 +536,20 @@ function oe(e) {
 			});
 		},
 		resolveId(e) {
-			if (e === N) {
-				let e = F();
-				return P(h(e, "host.tsx"));
+			if (e === P) {
+				let e = I();
+				return F(h(e, "host.tsx"));
 			}
-			if (e === ae) return M;
+			if (e === oe) return N;
 		},
 		load(e) {
-			if (e === M) return `export { default } from "${P(_(process.cwd(), t))}";`;
+			if (e === N) return `export { default } from "${F(_(process.cwd(), t))}";`;
 		}
 	}, i = {
 		name: "glasshome-widget:schema",
 		apply: "build",
 		async closeBundle() {
-			q(_(process.cwd(), "dist"), "index"), await j({
+			q(_(process.cwd(), "dist"), "index"), await M({
 				outFile: _(process.cwd(), "dist", "index.js"),
 				hashFile: _(process.cwd(), ".schema-hash"),
 				widgetName: "index",
@@ -551,13 +560,13 @@ function oe(e) {
 	return [
 		...X(),
 		n,
-		B(),
-		U(),
+		V(),
+		W(),
 		i,
 		r
 	];
 }
-function se(e) {
+function le(e) {
 	let t = e?.srcDir ?? "src", n = e?.outDir ?? "dist", r = [];
 	return [{
 		name: "glasshome-widgets:build",
@@ -585,4 +594,4 @@ function se(e) {
 	}];
 }
 //#endregion
-export { E as MAX_EXAMPLES, $ as buildWidgets, ie as createIntrospectSession, H as createUiImportTracker, Z as discoverWidgets, Q as generateRegistry, oe as glasshomeWidget, se as glasshomeWidgets, w as introspectOnce, z as isDirectSyncLayerImportSource, V as isDirectUiImportSource, I as isWidgetExternal, j as runSchemaGuard };
+export { D as MAX_EXAMPLES, $ as buildWidgets, C as createIntrospectSession, U as createUiImportTracker, Z as discoverWidgets, Q as generateRegistry, ce as glasshomeWidget, le as glasshomeWidgets, S as introspectOnce, B as isDirectSyncLayerImportSource, H as isDirectUiImportSource, L as isWidgetExternal, M as runSchemaGuard };

package/package.json

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