x-runtime-lib 0.9.18 → 0.9.19

package/dist/index.js

@@ -673,15 +673,19 @@ function Rn(e) {
 	return e.startsWith("ref_v") || e.startsWith("multiple_ref_v") || e.startsWith("slot_v") || e.startsWith("multiple_slot_v");
 }
 function zn(e, t, ...n) {
-	let r = {};
-	return e.forEach((e) => {
-		In(e.key) ? e.group && e.children && (r[e.group] || (r[e.group] = []), r[e.group].push(...e.children.map((e) => t(e, ...n)))) : Fn(e.key) ? e.render && e.children && (r.default ||= [], r.default.push(...e.children.map((e) => t(e, ...n)))) : (r.default ||= [], r.default.push(t(e, ...n)));
+	let r = [];
+	return e?.forEach((e) => {
+		In(e.key) ? e.group === "default" && e.children && r.push(...e.children.map((e) => t(e, ...n))) : Fn(e.key) ? e.render && e.children && r.push(...e.children.map((e) => t(e, ...n))) : r.push(t(e, ...n));
 	}), r;
 }
-function Bn(e) {
-	let t = {};
-	for (let n in e) e[n].length > 0 && (t[n] = () => e[n]);
-	return t;
+function Bn(e, t, ...n) {
+	let r = {};
+	e?.forEach((e) => {
+		In(e.key) ? e.group && e.children && (r[e.group] || (r[e.group] = []), r[e.group].push(...e.children.map((e) => t(e, ...n)))) : Fn(e.key) ? e.render && e.children && (r.default ||= [], r.default.push(...e.children.map((e) => t(e, ...n)))) : (r.default ||= [], r.default.push(t(e, ...n)));
+	});
+	let i = {};
+	for (let e in r) r[e].length > 0 && (i[e] = () => r[e]);
+	return i;
 }
 //#endregion
 //#region src/utils/sandbox.ts
@@ -2744,10 +2748,10 @@ function Br(e, t, n) {
 			compId: t.compId
 		});
 		let a = {};
-		return !n.leaf && t.children && (a = zn(t.children, r)), T(n.comp, {
+		return !n.leaf && t.children && (a = Bn(t.children, r)), T(n.comp, {
 			key: t.id,
 			...i
-		}, Bn(a));
+		}, a);
 	}
 	return { render: () => {
 		let { i18n: i } = Ae;
@@ -4003,14 +4007,13 @@ var Ti = g, Ei = /* @__PURE__ */ w({
 				compId: t.compId
 			});
 			let i = {};
-			return !n.leaf && t.children && (i = zn(t.children, o)), T(n.comp, {
+			return !n.leaf && t.children && (i = Bn(t.children, o)), T(n.comp, {
 				key: t.id,
 				...r
-			}, Bn(i));
+			}, i);
 		}, s = () => {
-			let t = {};
-			if (a.value && (t = zn(a.value.view.nodeLites, o)), e.subtype === "ui") return T("div", null, t);
-			if (e.subtype === "3d") return T("TresGroup", null, t);
+			if (e.subtype === "ui") return T("div", null, zn(a.value?.view.nodeLites, o));
+			if (e.subtype === "3d") return T("TresGroup", null, zn(a.value?.view.nodeLites, o));
 		};
 		return (e, t) => (O(), b(s));
 	}
@@ -4160,14 +4163,13 @@ var Ti = g, Ei = /* @__PURE__ */ w({
 				compId: t.compId
 			});
 			let i = {};
-			return !n.leaf && t.children && (i = zn(t.children, o)), T(n.comp, {
+			return !n.leaf && t.children && (i = Bn(t.children, o)), T(n.comp, {
 				key: t.id,
 				...r
-			}, Bn(i));
+			}, i);
 		}, s = () => {
-			let t = {};
-			if (a.value && (t = zn(a.value.view.nodeLites, o)), e.subtype === "ui") return T("div", null, t);
-			if (e.subtype === "3d") return T("TresGroup", null, t);
+			if (e.subtype === "ui") return T("div", null, zn(a.value?.view.nodeLites, o));
+			if (e.subtype === "3d") return T("TresGroup", null, zn(a.value?.view.nodeLites, o));
 		};
 		return (e, t) => (O(), b(s));
 	}
@@ -4311,10 +4313,10 @@ var Ti = g, Ei = /* @__PURE__ */ w({
 				compId: e.compId
 			});
 			let i = {};
-			return !t.leaf && e.children && (i = zn(e.children, m)), T(t.comp, {
+			return !t.leaf && e.children && (i = Bn(e.children, m)), T(t.comp, {
 				key: e.id,
 				...r
-			}, Bn(i));
+			}, i);
 		}, h = () => {
 			if (!n.refContext) {
 				console.assert(!1, "invalid ref context");
@@ -4348,17 +4350,16 @@ var Ti = g, Ei = /* @__PURE__ */ w({
 				console.assert(!1, "subtype not match");
 				return;
 			}
-			let r = zn(s.value.view.nodeLites, m);
 			if (s.value.type === "ui") return T("div", {
 				id: t.id,
 				style: u.value
-			}, r);
+			}, zn(s.value.view.nodeLites, m));
 			if (s.value.type === "3d") return T(ji, {
 				name: t.name,
 				position: d.value,
 				rotation: f.value,
 				scale: p.value
-			}, r);
+			}, zn(s.value.view.nodeLites, m));
 		};
 		return (e, t) => (O(), b(h));
 	}
@@ -4416,10 +4417,10 @@ var Vi = /* @__PURE__ */ si(zi, [["render", Bi]]), Hi = /* @__PURE__ */ w({
 				compId: e.compId
 			});
 			let i = {};
-			return !t.leaf && e.children && (i = zn(e.children, p)), T(t.comp, {
+			return !t.leaf && e.children && (i = Bn(e.children, p)), T(t.comp, {
 				key: e.id,
 				...r
-			}, Bn(i));
+			}, i);
 		}
 		let m = () => {
 			if (!n.refContext) {
@@ -4454,17 +4455,16 @@ var Vi = /* @__PURE__ */ si(zi, [["render", Bi]]), Hi = /* @__PURE__ */ w({
 				console.assert(!1, "subtype not match");
 				return;
 			}
-			let r = zn(s.value.view.nodeLites, p);
 			if (s.value.type === "ui") return T("div", {
 				id: t.id,
 				style: l.value
-			}, r);
+			}, zn(s.value.view.nodeLites, p));
 			if (s.value.type === "3d") return T(ji, {
 				name: t.name,
 				position: u.value,
 				rotation: d.value,
 				scale: f.value
-			}, r);
+			}, zn(s.value.view.nodeLites, p));
 		};
 		return (e, t) => (O(), b(m));
 	}
@@ -12987,4 +12987,4 @@ async function Bl(e) {
 	}), `./locales/${e}/index.ts`, 4)).default;
 }
 //#endregion
-export { dt as addIndent, We as breakpoints, qe as calcBreakpoint, _t as compTypes, Xe as createBreakpointProperty, R as createMakeNode, Vt as createNode, Pt as dataStringify, Wt as duplicateNodePair, Gt as duplicateNodePairs, yt as elementKeys, bl as finalProperties, ct as fromDotString, Qe as genId, xt as getAllElements, Ke as getBreakpointName, Ye as getBreakpointProperty, St as getElement, lt as getField, Vn as getImplementMethodName, Je as getIndexOfBreakpoint, Tt as getItems, Ht as getNodeLite, zt as getPropertyDefault, Rt as getPropertyDefaultArray, ot as getRadius, vt as getTag, kt as getTypes, Rn as hasComp, Ln as hasSlot, Bt as initProperties, Pn as injectActivatorContext, _n as injectDark, Cn as injectData, Tn as injectDepends, hn as injectDevice, fn as injectEnv, yn as injectId, Sn as injectMeta, z as injectMode, Mn as injectNode, An as injectNodeLite, un as injectOrg, Dn as injectRuntime, H as injectSandbox, xn as injectType, jt as isCircularReference, At as isExecutableMode, rt as isHexColor, tt as isPercent, $e as isPixel, In as isRenderGroup, Fn as isRenderSwitch, at as isThemeColor, Ct as itemsKeys, Bl as loadLocaleMessageRuntime, U as makeEventId, rr as makeEventKeyOfCustomSlot, tr as makeEventKeyOfElementSlot, Jn as makeMethodId, Qn as makeMethodKeyOfCustomSlot, Xn as makeMethodKeyOfElementSlot, Ut as makeNodePair, Hn as makePropertyId, Kn as makePropertyKeyOfCustomSlot, Wn as makePropertyKeyOfElementSlot, ar as makeSlotId, sr as makeTriggerId, It as metaStringify, gt as pageTypes, Ft as parseData, Lt as parseMeta, nt as parsePercent, et as parsePixel, Tr as pkgs, Nn as provideActivatorContext, gn as provideDark, V as provideData, wn as provideDepends, mn as provideDevice, dn as provideEnv, vn as provideId, B as provideMeta, pn as provideMode, jn as provideNode, kn as provideNodeLite, ln as provideOrg, En as provideRuntime, On as provideSandbox, bn as provideType, I as regElement, L as regItems, Ot as regTypes, Ge as reverseBreakpoints, ut as setField, Mt as syncNodeLite, it as themeColors, st as toDotString, ht as toEventName, mt as toMethodName, Nt as toNodeLite, pt as toPropertyName, zn as toRenderGroups, Bn as toRenderSlots, Et as typesKeys, er as unwrapEventId, ir as unwrapEventKeyOfCustomSlot, nr as unwrapEventKeyOfElementSlot, Yn as unwrapMethodId, $n as unwrapMethodKeyOfCustomSlot, Zn as unwrapMethodKeyOfElementSlot, Un as unwrapPropertyId, qn as unwrapPropertyKeyOfCustomSlot, Gn as unwrapPropertyKeyOfElementSlot, or as unwrapSlotId, cr as unwrapTriggerId, lr as useColor, W as useDepend, ur as useRuntime, Rl as useSandbox, $ as useTheme };
+export { dt as addIndent, We as breakpoints, qe as calcBreakpoint, _t as compTypes, Xe as createBreakpointProperty, R as createMakeNode, Vt as createNode, Pt as dataStringify, Wt as duplicateNodePair, Gt as duplicateNodePairs, yt as elementKeys, bl as finalProperties, ct as fromDotString, Qe as genId, xt as getAllElements, Ke as getBreakpointName, Ye as getBreakpointProperty, St as getElement, lt as getField, Vn as getImplementMethodName, Je as getIndexOfBreakpoint, Tt as getItems, Ht as getNodeLite, zt as getPropertyDefault, Rt as getPropertyDefaultArray, ot as getRadius, vt as getTag, kt as getTypes, Rn as hasComp, Ln as hasSlot, Bt as initProperties, Pn as injectActivatorContext, _n as injectDark, Cn as injectData, Tn as injectDepends, hn as injectDevice, fn as injectEnv, yn as injectId, Sn as injectMeta, z as injectMode, Mn as injectNode, An as injectNodeLite, un as injectOrg, Dn as injectRuntime, H as injectSandbox, xn as injectType, jt as isCircularReference, At as isExecutableMode, rt as isHexColor, tt as isPercent, $e as isPixel, In as isRenderGroup, Fn as isRenderSwitch, at as isThemeColor, Ct as itemsKeys, Bl as loadLocaleMessageRuntime, U as makeEventId, rr as makeEventKeyOfCustomSlot, tr as makeEventKeyOfElementSlot, Jn as makeMethodId, Qn as makeMethodKeyOfCustomSlot, Xn as makeMethodKeyOfElementSlot, Ut as makeNodePair, Hn as makePropertyId, Kn as makePropertyKeyOfCustomSlot, Wn as makePropertyKeyOfElementSlot, ar as makeSlotId, sr as makeTriggerId, It as metaStringify, gt as pageTypes, Ft as parseData, Lt as parseMeta, nt as parsePercent, et as parsePixel, Tr as pkgs, Nn as provideActivatorContext, gn as provideDark, V as provideData, wn as provideDepends, mn as provideDevice, dn as provideEnv, vn as provideId, B as provideMeta, pn as provideMode, jn as provideNode, kn as provideNodeLite, ln as provideOrg, En as provideRuntime, On as provideSandbox, bn as provideType, I as regElement, L as regItems, Ot as regTypes, Ge as reverseBreakpoints, ut as setField, Mt as syncNodeLite, it as themeColors, st as toDotString, ht as toEventName, mt as toMethodName, Nt as toNodeLite, pt as toPropertyName, zn as toRenderDefault, Bn as toRenderSlots, Et as typesKeys, er as unwrapEventId, ir as unwrapEventKeyOfCustomSlot, nr as unwrapEventKeyOfElementSlot, Yn as unwrapMethodId, $n as unwrapMethodKeyOfCustomSlot, Zn as unwrapMethodKeyOfElementSlot, Un as unwrapPropertyId, qn as unwrapPropertyKeyOfCustomSlot, Gn as unwrapPropertyKeyOfElementSlot, or as unwrapSlotId, cr as unwrapTriggerId, lr as useColor, W as useDepend, ur as useRuntime, Rl as useSandbox, $ as useTheme };

package/dist/utils/render.d.ts

@@ -3,11 +3,7 @@ export declare function isRenderSwitch(key: string): boolean;
 export declare function isRenderGroup(key: string): boolean;
 export declare function hasSlot(key: string): boolean;
 export declare function hasComp(key: string): boolean;
-export declare function toRenderGroups(children: NodeLite[], renderNode: (n: NodeLite, ...params: any[]) => any, ...params: any[]): {
-    [key: string]: any[];
-};
-export declare function toRenderSlots(groups: {
-    [key: string]: any[];
-}): {
+export declare function toRenderDefault(children: NodeLite[] | undefined, renderNode: (n: NodeLite, ...params: any[]) => any, ...params: any[]): any[];
+export declare function toRenderSlots(children: NodeLite[] | undefined, renderNode: (n: NodeLite, ...params: any[]) => any, ...params: any[]): {
     [key: string]: any;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "x-runtime-lib",
   "private": false,
-  "version": "0.9.18",
+  "version": "0.9.19",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",