x-runtime-lib 0.9.42 → 0.9.43

package/dist/index.d.ts

@@ -8,6 +8,7 @@ import { Reactive } from 'vue';
 import { Ref } from 'vue';
 import { ShallowRef } from 'vue';
 import { Type } from 'x-essential-lib';
+import { VNode } from 'vue';
 import { WritableComputedRef } from 'vue';
 
 export declare interface ActivatorContext {
@@ -310,6 +311,8 @@ export declare function makeSlotId(kind: SlotKind, mainKey: string, slotKey: str
 
 export declare function makeTriggerId(kind: TriggerKind, triggerKey: string): string;
 
+export declare function mergeRenderResult(main: RenderResult, part: RenderResult): void;
+
 export declare type Meta = {
     version: string;
     states?: Field[];
@@ -493,6 +496,14 @@ export declare function regItems(key: ZItemsKey, items: ZItem[]): void;
 
 export declare function regTypes(key: ZTypesKey, types: ZType[]): void;
 
+export declare interface RenderResult {
+    [slot: string]: VNode[];
+}
+
+export declare interface RenderSlots {
+    [slot: string]: () => VNode[];
+}
+
 export declare const reverseBreakpoints: readonly ["xl", "lg", "md", "sm", "xs"];
 
 export declare const rules: readonly ["required", "email", "minLength", "maxLength", "length"];
@@ -644,11 +655,7 @@ export declare function toNodeLite(node: Node_2, children?: NodeLite[]): NodeLit
 
 export declare function toPropertyName(kind: PropertyKind, names: string[]): string;
 
-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;
-};
+export declare function toRenderSlots(result: RenderResult): RenderSlots;
 
 export declare interface Transients {
     [nodeId: string]: {

package/dist/index.js

@@ -427,20 +427,13 @@ function qt(e) {
 function Jt(e) {
 	return e.startsWith("ref_v") || e.startsWith("multiple_ref_v") || e.startsWith("slot_v") || e.startsWith("multiple_slot_v");
 }
-function Yt(e, t, ...n) {
-	let r = [];
-	return e?.forEach((e) => {
-		Gt(e.key) ? e.inlineSlot === "default" && e.children && r.push(...e.children.map((e) => t(e, ...n))) : Wt(e.key) ? e.render && e.children && r.push(...e.children.map((e) => t(e, ...n))) : r.push(t(e, ...n));
-	}), r;
+function Yt(e, t) {
+	for (let n in t) e[n] || (e[n] = []), e[n].push(...t[n]);
 }
-function Xt(e, t, ...n) {
-	let r = {};
-	e?.forEach((e) => {
-		Gt(e.key) ? e.inlineSlot && e.children && (r[e.inlineSlot] || (r[e.inlineSlot] = []), r[e.inlineSlot].push(...e.children.map((e) => t(e, ...n)))) : Wt(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;
+function Xt(e) {
+	let t = {};
+	for (let n in e) t[n] = () => e[n];
+	return t;
 }
 //#endregion
 //#region src/utils/node.ts
@@ -2881,28 +2874,42 @@ function qn(e, t, n, r) {
 //#endregion
 //#region src/composables/element/core/elementSlotRender.ts
 function Jn(e, t, n) {
-	function r(t) {
-		let n = ft(t.key);
-		if (!n) {
-			console.assert(!1, `element not found key=${t.key}`);
-			return;
+	function r(t, n) {
+		let i = ft(t.key);
+		if (!i) return console.error(`elementSlotRender/renderNode element not found key=${t.key}`), {};
+		if (Gt(t.key)) {
+			if (!t.inlineSlot || !t.children) return {};
+			let e = {};
+			for (let n of t.children) Yt(e, r(n, t.inlineSlot));
+			return e;
+		} else if (Wt(t.key)) {
+			if (!t.render || !t.children) return {};
+			let e = {};
+			for (let i of t.children) Yt(e, r(i, n));
+			return e;
+		} else {
+			let a = { nodeId: t.id };
+			Jt(t.key) && (a.refContext = {
+				parent: e,
+				compId: t.compId
+			});
+			let o = {};
+			if (Kt(i) && t.children) for (let e of t.children) Yt(o, r(e, "default"));
+			return { [n]: [A(i.comp, {
+				key: t.id,
+				...a
+			}, Xt(o))] };
 		}
-		let i = { nodeId: t.id };
-		Jt(t.key) && (i.refContext = {
-			parent: e,
-			compId: t.compId
-		});
-		let a = {};
-		return Kt(n) && t.children && (a = Xt(t.children, r)), A(n.comp, {
-			key: t.id,
-			...i
-		}, a);
 	}
-	return { render: () => {
+	function i() {
 		let { i18n: i } = re;
 		if (Ze(e, t)) return A("div", null, i.global.t("x-runtime-lib.circularReference"));
-		if (n.value && n.value.type === "ui") return A("div", {}, Yt(n.value.view.nodeLites, r));
-	} };
+		if (!n.value) return;
+		let a = {};
+		for (let e of n.value.view.nodeLites) Yt(a, r(e, "default"));
+		if (n.value.type === "ui") return A("div", {}, Xt(a));
+	}
+	return { render: i };
 }
 //#endregion
 //#region src/composables/element/piece/3d/transform/v1/index.ts
@@ -4177,26 +4184,39 @@ var Lr = /* @__PURE__ */ hr(Fr, [["render", Ir]]), Rr = [
 		wl(a);
 		let o = Ee({});
 		El(o), Hn("multipleRef", e.nodeId, "", e.instance, Nl(), i, a, o);
-		let s = (t) => {
-			let n = ft(t.key);
-			if (!n) {
-				console.assert(!1, `element not found key=${t.key}`);
-				return;
+		function s(t, n) {
+			let r = ft(t.key);
+			if (!r) return console.error(`multipleRefV1/renderNode element not found key = ${t.key}`), {};
+			if (Gt(t.key)) {
+				if (!t.inlineSlot || !t.children) return {};
+				let e = {};
+				for (let n of t.children) Yt(e, s(n, t.inlineSlot));
+				return e;
+			} else if (Wt(t.key)) {
+				if (!t.render || !t.children) return {};
+				let e = {};
+				for (let r of t.children) Yt(e, s(r, n));
+				return e;
+			} else {
+				let i = { nodeId: t.id };
+				Jt(t.key) && (i.refContext = {
+					parent: e.refContext,
+					compId: t.compId
+				});
+				let a = {};
+				if (Kt(r) && t.children) for (let e of t.children) Yt(a, s(e, "default"));
+				return { [n]: [A(r.comp, {
+					key: t.id,
+					...i
+				}, Xt(a))] };
 			}
-			let r = { nodeId: t.id };
-			Jt(t.key) && (r.refContext = {
-				parent: e.refContext,
-				compId: t.compId
-			});
-			let i = {};
-			return Kt(n) && t.children && (i = Xt(t.children, s)), A(n.comp, {
-				key: t.id,
-				...r
-			}, i);
-		}, c = () => {
-			if (e.subtype === "ui") return A("div", null, { default: () => Yt(a.value?.view.nodeLites, s) });
-			if (e.subtype === "3d") return A("TresGroup", null, { default: () => Yt(a.value?.view.nodeLites, s) });
-		};
+		}
+		function c() {
+			let t = {};
+			if (a.value) for (let e of a.value.view.nodeLites) Yt(t, s(e, "default"));
+			if (e.subtype === "ui") return A("div", null, Xt(t));
+			if (e.subtype === "3d") return A("TresGroup", null, Xt(t));
+		}
 		return (e, t) => (M(), T(c));
 	}
 }), Hr = /* @__PURE__ */ k({
@@ -4309,26 +4329,39 @@ var Lr = /* @__PURE__ */ hr(Fr, [["render", Ir]]), Rr = [
 		wl(a);
 		let o = Ee({});
 		El(o), Hn("multipleCustomSlot", e.nodeId, "", e.instance, Nl(), i, a, o);
-		let s = (t) => {
-			let n = ft(t.key);
-			if (!n) {
-				console.assert(!1, `element not found key=${t.key}`);
-				return;
+		function s(t, n) {
+			let r = ft(t.key);
+			if (!r) return console.error(`multipleSlotV1/renderNode element not found key=${t.key}`), {};
+			if (Gt(t.key)) {
+				if (!t.inlineSlot || !t.children) return {};
+				let e = {};
+				for (let n of t.children) Yt(e, s(n, t.inlineSlot));
+				return e;
+			} else if (Wt(t.key)) {
+				if (!t.render || !t.children) return {};
+				let e = {};
+				for (let r of t.children) Yt(e, s(r, n));
+				return e;
+			} else {
+				let i = { nodeId: t.id };
+				Jt(t.key) && (i.refContext = {
+					parent: e.refContext,
+					compId: t.compId
+				});
+				let a = {};
+				if (Kt(r) && t.children) for (let e of t.children) Yt(a, s(e, "default"));
+				return { [n]: [A(r.comp, {
+					key: t.id,
+					...i
+				}, Xt(a))] };
 			}
-			let r = { nodeId: t.id };
-			Jt(t.key) && (r.refContext = {
-				parent: e.refContext,
-				compId: t.compId
-			});
-			let i = {};
-			return Kt(n) && t.children && (i = Xt(t.children, s)), A(n.comp, {
-				key: t.id,
-				...r
-			}, i);
-		}, c = () => {
-			if (e.subtype === "ui") return A("div", null, { default: () => Yt(a.value?.view.nodeLites, s) });
-			if (e.subtype === "3d") return A("TresGroup", null, { default: () => Yt(a.value?.view.nodeLites, s) });
-		};
+		}
+		function c() {
+			let t = {};
+			if (a.value) for (let e of a.value.view.nodeLites) Yt(t, s(e, "default"));
+			if (e.subtype === "ui") return A("div", null, Xt(t));
+			if (e.subtype === "3d") return A("TresGroup", null, Xt(t));
+		}
 		return (e, t) => (M(), T(c));
 	}
 }), Wr = /* @__PURE__ */ k({
@@ -4461,29 +4494,40 @@ var Lr = /* @__PURE__ */ hr(Fr, [["render", Ir]]), Rr = [
 				f.value = e.value, p.value = t.value, m.value = r.value;
 			});
 		}
-		let h = (t) => {
-			let n = ft(t.key);
-			if (!n) {
-				console.assert(!1, `element not found key=${t.key}`);
-				return;
+		function h(t, n) {
+			let r = ft(t.key);
+			if (!r) return console.error(`refV1/renderNode element not found key=${t.key}`), {};
+			if (Gt(t.key)) {
+				if (!t.inlineSlot || !t.children) return {};
+				let e = {};
+				for (let n of t.children) Yt(e, h(n, t.inlineSlot));
+				return e;
+			} else if (Wt(t.key)) {
+				if (!t.render || !t.children) return {};
+				let e = {};
+				for (let r of t.children) Yt(e, h(r, n));
+				return e;
+			} else {
+				let i = { nodeId: t.id };
+				Jt(t.key) && (i.refContext = {
+					parent: e.refContext,
+					compId: t.compId
+				});
+				let a = {};
+				if (Kt(r) && t.children) for (let e of t.children) Yt(a, h(e, "default"));
+				return { [n]: [A(r.comp, {
+					key: t.id,
+					...i
+				}, Xt(a))] };
 			}
-			let r = { nodeId: t.id };
-			Jt(t.key) && (r.refContext = {
-				parent: e.refContext,
-				compId: t.compId
-			});
-			let i = {};
-			return Kt(n) && t.children && (i = Xt(t.children, h)), A(n.comp, {
-				key: t.id,
-				...r
-			}, i);
-		}, g = () => {
+		}
+		function g() {
 			if (!e.refContext) {
-				console.assert(!1, "invalid ref context");
+				console.error("refV1/render invalid ref context");
 				return;
 			}
 			if (!i.value) {
-				console.assert(!1, "invalid data");
+				console.error("refV1/render invalid data");
 				return;
 			}
 			let { i18n: n } = re;
@@ -4507,20 +4551,22 @@ var Lr = /* @__PURE__ */ hr(Fr, [["render", Ir]]), Rr = [
 				scale: m.value
 			}) : void 0;
 			if (o.value.type !== i.value.type) {
-				console.assert(!1, "subtype not match");
+				console.error("refV1/render subtype not match");
 				return;
 			}
+			let a = {};
+			for (let e of o.value.view.nodeLites) Yt(a, h(e, "default"));
 			if (o.value.type === "ui") return A("div", {
 				id: t.id,
 				style: d.value
-			}, { default: () => Yt(o.value?.view.nodeLites, h) });
+			}, Xt(a));
 			if (o.value.type === "3d") return A(Br, {
 				name: t.name,
 				position: f.value,
 				rotation: p.value,
 				scale: m.value
-			}, { default: () => Yt(o.value?.view.nodeLites, h) });
-		};
+			}, Xt(a));
+		}
 		return (e, t) => (M(), T(g));
 	}
 }), Kr = {};
@@ -4563,30 +4609,40 @@ var Jr = /* @__PURE__ */ hr(Kr, [["render", qr]]), Yr = /* @__PURE__ */ k({
 				d.value = e.value, f.value = t.value, p.value = r.value;
 			});
 		}
-		function m(t) {
-			let n = ft(t.key);
-			if (!n) {
-				console.assert(!1, `element not found key=${t.key}`);
-				return;
+		function m(t, n) {
+			let r = ft(t.key);
+			if (!r) return console.error(`slotV1/renderNode element not found key=${t.key}`), {};
+			if (Gt(t.key)) {
+				if (!t.inlineSlot || !t.children) return {};
+				let e = {};
+				for (let n of t.children) Yt(e, m(n, t.inlineSlot));
+				return e;
+			} else if (Wt(t.key)) {
+				if (!t.render || !t.children) return {};
+				let e = {};
+				for (let r of t.children) Yt(e, m(r, n));
+				return e;
+			} else {
+				let i = { nodeId: t.id };
+				Jt(t.key) && (i.refContext = {
+					parent: e.refContext,
+					compId: t.compId
+				});
+				let a = {};
+				if (Kt(r) && t.children) for (let e of t.children) Yt(a, m(e, "default"));
+				return { [n]: [A(r.comp, {
+					key: t.id,
+					...i
+				}, Xt(a))] };
 			}
-			let r = { nodeId: t.id };
-			Jt(t.key) && (r.refContext = {
-				parent: e.refContext,
-				compId: t.compId
-			});
-			let i = {};
-			return Kt(n) && t.children && (i = Xt(t.children, m)), A(n.comp, {
-				key: t.id,
-				...r
-			}, i);
 		}
-		let h = () => {
+		function h() {
 			if (!e.refContext) {
-				console.assert(!1, "invalid ref context");
+				console.error("slotV1/render invalid ref context");
 				return;
 			}
 			if (!i.value) {
-				console.assert(!1, "invalid data");
+				console.error("slotV1/render invalid data");
 				return;
 			}
 			let { i18n: n } = re;
@@ -4610,20 +4666,22 @@ var Jr = /* @__PURE__ */ hr(Kr, [["render", qr]]), Yr = /* @__PURE__ */ k({
 				scale: p.value
 			}) : void 0;
 			if (o.value.type !== i.value.type) {
-				console.assert(!1, "subtype not match");
+				console.error("slotV1/render subtype not match");
 				return;
 			}
+			let a = {};
+			for (let e of o.value.view.nodeLites) Yt(a, m(e, "default"));
 			if (o.value.type === "ui") return A("div", {
 				id: t.id,
 				style: u.value
-			}, { default: () => Yt(o.value?.view.nodeLites, m) });
+			}, Xt(a));
 			if (o.value.type === "3d") return A(Br, {
 				name: t.name,
 				position: d.value,
 				rotation: f.value,
 				scale: p.value
-			}, { default: () => Yt(o.value?.view.nodeLites, m) });
-		};
+			}, Xt(a));
+		}
 		return (e, t) => (M(), T(h));
 	}
 }), Xr = /* @__PURE__ */ k({
@@ -14260,7 +14318,7 @@ function xs(e, t) {
 						type: "set_app_property_v1",
 						binds: ["card", "elementProperty/placeholder/settings.style.color"],
 						inputs: { VALUE: { block: {
-							type: "color_types_v1",
+							type: "color_v1",
 							extraState: { value: "primary" },
 							fields: { TYPE: "theme" }
 						} } }
@@ -14269,8 +14327,8 @@ function xs(e, t) {
 						type: "set_app_property_v1",
 						binds: ["card", "elementProperty/placeholder/settings.style.color"],
 						inputs: { VALUE: { shadow: {
-							type: "color_types_v1",
-							extraState: { value: "" }
+							type: "color_v1",
+							extraState: { value: null }
 						} } }
 					} }
 				}
@@ -19946,4 +20004,4 @@ async function xu(e) {
 	}), `./locales/${e}/index.ts`, 4)).default;
 }
 //#endregion
-export { It as addIndent, yu as applyBlockBind, pt as breakpoints, gt as calcBreakpoint, $e as compTypes, yt as createBreakpointProperty, H as createMakeNode, Zt as createNode, du as dataStringify, en as duplicateNodePair, tn as duplicateNodePairs, lt as elementKeys, Fc as finalProperties, Nt as fromDotString, xt as genId, dt as getAllElements, ht as getBreakpointName, vt as getBreakpointProperty, ft as getElement, Pt as getField, Bl as getImplementMethodName, _t as getIndexOfBreakpoint, rt as getItems, Qt as getNodeLite, Ht as getPropertyDefault, Vt as getPropertyDefaultArray, jt as getRadius, et as getTag, ct as getTypes, Jt as hasComp, Kt as hasInlineSlot, qt as hasSlot, Ut as initProperties, Rn as initQuickJS, _l as injectDark, Tl as injectData, kl as injectDepends, hl as injectDevice, fl as injectEnv, yl as injectId, Cl as injectMeta, $ as injectMode, Ll as injectNode, Fl as injectNodeLite, ul as injectOrg, jl as injectRuntime, Nl as injectSandbox, zl as injectSlotProps, Dl as injectTransients, xl as injectType, Ze as isCircularReference, R as isExecutableMode, Ot as isHexColor, Gt as isInlineSlot, St as isNull, Ct as isNumber, Et as isPercent, wt as isPixel, Wt as isRenderSwitch, At as isThemeColor, tt as itemsKeys, xu as loadLocaleMessageRuntime, $l as makeEventId, ru as makeEventKeyOfCustomSlot, tu as makeEventKeyOfElementSlot, ql as makeMethodId, Zl as makeMethodKeyOfCustomSlot, Yl as makeMethodKeyOfElementSlot, $t as makeNodePair, Vl as makePropertyId, Gl as makePropertyKeyOfCustomSlot, Ul as makePropertyKeyOfElementSlot, au as makeSlotId, su as makeTriggerId, pu as metaStringify, Qe as pageTypes, fu as parseData, mu as parseMeta, Dt as parsePercent, Tt as parsePixel, En as pkgs, gl as provideDark, wl as provideData, Ol as provideDepends, ml as provideDevice, dl as provideEnv, vl as provideId, Sl as provideMeta, pl as provideMode, Il as provideNode, Pl as provideNodeLite, ll as provideOrg, Al as provideRuntime, Ml as provideSandbox, Rl as provideSlotProps, El as provideTransients, bl as provideType, vu as regBindHandles, B as regElement, z as regItems, st as regTypes, mt as reverseBreakpoints, it as rules, Ft as setField, gu as setupHooks, lu as syncNodeLite, kt as themeColors, Mt as toDotString, Bt as toEventName, zt as toMethodName, uu as toNodeLite, Rt as toPropertyName, Yt as toRenderDefault, Xt as toRenderSlots, at as typesKeys, eu as unwrapEventId, iu as unwrapEventKeyOfCustomSlot, nu as unwrapEventKeyOfElementSlot, Jl as unwrapMethodId, Ql as unwrapMethodKeyOfCustomSlot, Xl as unwrapMethodKeyOfElementSlot, Hl as unwrapPropertyId, Kl as unwrapPropertyKeyOfCustomSlot, Wl as unwrapPropertyKeyOfElementSlot, ou as unwrapSlotId, cu as unwrapTriggerId, In as useColor, Ln as useDepend, Vn as useGlobalTransient, zn as useRuntime, Hn as useSandbox };
+export { It as addIndent, yu as applyBlockBind, pt as breakpoints, gt as calcBreakpoint, $e as compTypes, yt as createBreakpointProperty, H as createMakeNode, Zt as createNode, du as dataStringify, en as duplicateNodePair, tn as duplicateNodePairs, lt as elementKeys, Fc as finalProperties, Nt as fromDotString, xt as genId, dt as getAllElements, ht as getBreakpointName, vt as getBreakpointProperty, ft as getElement, Pt as getField, Bl as getImplementMethodName, _t as getIndexOfBreakpoint, rt as getItems, Qt as getNodeLite, Ht as getPropertyDefault, Vt as getPropertyDefaultArray, jt as getRadius, et as getTag, ct as getTypes, Jt as hasComp, Kt as hasInlineSlot, qt as hasSlot, Ut as initProperties, Rn as initQuickJS, _l as injectDark, Tl as injectData, kl as injectDepends, hl as injectDevice, fl as injectEnv, yl as injectId, Cl as injectMeta, $ as injectMode, Ll as injectNode, Fl as injectNodeLite, ul as injectOrg, jl as injectRuntime, Nl as injectSandbox, zl as injectSlotProps, Dl as injectTransients, xl as injectType, Ze as isCircularReference, R as isExecutableMode, Ot as isHexColor, Gt as isInlineSlot, St as isNull, Ct as isNumber, Et as isPercent, wt as isPixel, Wt as isRenderSwitch, At as isThemeColor, tt as itemsKeys, xu as loadLocaleMessageRuntime, $l as makeEventId, ru as makeEventKeyOfCustomSlot, tu as makeEventKeyOfElementSlot, ql as makeMethodId, Zl as makeMethodKeyOfCustomSlot, Yl as makeMethodKeyOfElementSlot, $t as makeNodePair, Vl as makePropertyId, Gl as makePropertyKeyOfCustomSlot, Ul as makePropertyKeyOfElementSlot, au as makeSlotId, su as makeTriggerId, Yt as mergeRenderResult, pu as metaStringify, Qe as pageTypes, fu as parseData, mu as parseMeta, Dt as parsePercent, Tt as parsePixel, En as pkgs, gl as provideDark, wl as provideData, Ol as provideDepends, ml as provideDevice, dl as provideEnv, vl as provideId, Sl as provideMeta, pl as provideMode, Il as provideNode, Pl as provideNodeLite, ll as provideOrg, Al as provideRuntime, Ml as provideSandbox, Rl as provideSlotProps, El as provideTransients, bl as provideType, vu as regBindHandles, B as regElement, z as regItems, st as regTypes, mt as reverseBreakpoints, it as rules, Ft as setField, gu as setupHooks, lu as syncNodeLite, kt as themeColors, Mt as toDotString, Bt as toEventName, zt as toMethodName, uu as toNodeLite, Rt as toPropertyName, Xt as toRenderSlots, at as typesKeys, eu as unwrapEventId, iu as unwrapEventKeyOfCustomSlot, nu as unwrapEventKeyOfElementSlot, Jl as unwrapMethodId, Ql as unwrapMethodKeyOfCustomSlot, Xl as unwrapMethodKeyOfElementSlot, Hl as unwrapPropertyId, Kl as unwrapPropertyKeyOfCustomSlot, Wl as unwrapPropertyKeyOfElementSlot, ou as unwrapSlotId, cu as unwrapTriggerId, In as useColor, Ln as useDepend, Vn as useGlobalTransient, zn as useRuntime, Hn as useSandbox };

package/package.json

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