x-runtime-lib 0.8.208 → 0.8.209

package/dist/index.js

@@ -1370,12 +1370,12 @@ function useElementMethod(e, p, m) {
 		g?.eventBus.off(_, m);
 	});
 }
-var getPropertySandbox = async (e, p, m, g) => {
-	let _ = await e.getProperty(makePropertyId("elementProperty", p, toDotString(m)));
+var getPropertySandbox = (e, p, m, g) => {
+	let _ = e.getProperty(makePropertyId("elementProperty", p, toDotString(m)));
 	return g && typeof _ == "string" ? JSON.parse(_) : _;
 }, setPropertySandbox = async (e, p, m, g, _) => {
 	_ && typeof g == "object" && (g = JSON.stringify(g, null, 2)), await e.setProperty(makePropertyId("elementProperty", p, toDotString(m)), g);
-}, getPropertyEditor = async (e, p, m) => {
+}, getPropertyEditor = (e, p, m) => {
 	let g = getField(e, p);
 	return m && typeof g == "string" ? JSON.parse(g) : g;
 }, setPropertyEditor = async (e, p, m, g) => {
@@ -1383,8 +1383,8 @@ var getPropertySandbox = async (e, p, m, g) => {
 };
 function useElementProperty(e, p, m) {
 	let g = injectSandbox(), _ = ref();
-	return watchEffect(async () => {
-		g ? _.value = await getPropertySandbox(g, e.value.basic.id, p, m) : _.value = await getPropertyEditor(e.value, p, m);
+	return watchEffect(() => {
+		g ? _.value = getPropertySandbox(g, e.value.basic.id, p, m) : _.value = getPropertyEditor(e.value, p, m);
 	}), watch(_, async () => {
 		g ? await setPropertySandbox(g, e.value.basic.id, p, _.value, m) : await setPropertyEditor(e.value, p, _.value, m);
 	}), { property: _ };
@@ -3989,28 +3989,10 @@ var v1_default$40 = /* @__PURE__ */ __plugin_vue_export_helper_default(_sfc_main
 		refContext: {}
 	},
 	setup(e) {
-		let p = e, { node: m } = useElementBase(p), g = injectType(), _ = injectData(), v = injectSandbox(), { property: y } = useElementProperty(m, ["settings", "valid"]), { property: b } = useElementProperty(m, ["settings", "fastFail"]), { property: x } = useElementProperty(m, [
-			"settings",
-			"backgroundColor",
-			"mode"
-		]), { property: S } = useElementProperty(m, [
-			"settings",
-			"backgroundColor",
-			"theme"
-		]), { property: C } = useElementProperty(m, [
-			"settings",
-			"backgroundColor",
-			"custom",
-			"light"
-		]), { property: w } = useElementProperty(m, [
-			"settings",
-			"backgroundColor",
-			"custom",
-			"dark"
-		]), { color: T } = useColorV1(x, S, C, w), { applySize: E } = useSizeV1(p, m), { applyMargin: D } = useMarginV1(m), { applyPadding: O } = usePaddingV1(m), { applyBorder: k } = useBorderV1(m), A = computed(() => {
+		let p = e, { node: m } = useElementBase(p), g = injectType(), _ = injectData(), v = injectSandbox(), { property: y } = useElementProperty(m, ["settings", "valid"]), { property: b } = useElementProperty(m, ["settings", "fastFail"]), { applySize: x } = useSizeV1(p, m), { applyMargin: S } = useMarginV1(m), { applyPadding: C } = usePaddingV1(m), { applyBorder: w } = useBorderV1(m), T = computed(() => {
 			let e = {}, p = _.value?.type;
-			return g === "page" ? p === "ui" ? (E(e), D(e), O(e), k(e), T.value && (e.backgroundColor = T.value)) : console.assert(!1) : g === "comp" && p === "ui" ? (E(e), D(e), O(e), k(e), T.value && (e.backgroundColor = T.value)) : console.assert(!1), e;
-		}), j = async () => {
+			return g === "page" ? p === "ui" ? (x(e), S(e), C(e), w(e)) : console.assert(!1) : g === "comp" && p === "ui" ? (x(e), S(e), C(e), w(e)) : console.assert(!1), e;
+		}), E = async () => {
 			!v || !v.vm || await v.triggerEvent(makeEventId("elementEvent", p.nodeId, "submit"), []);
 		};
 		return (e, p) => {
@@ -4019,8 +4001,8 @@ var v1_default$40 = /* @__PURE__ */ __plugin_vue_export_helper_default(_sfc_main
 				modelValue: unref(y),
 				"onUpdate:modelValue": p[0] ||= (e) => isRef(y) ? y.value = e : null,
 				"fast-fail": unref(b),
-				style: normalizeStyle(A.value),
-				onSubmit: withModifiers(j, ["prevent"])
+				style: normalizeStyle(T.value),
+				onSubmit: withModifiers(E, ["prevent"])
 			}, {
 				default: withCtx(() => [renderSlot(e.$slots, "default")]),
 				_: 3
@@ -10481,8 +10463,8 @@ function bindView(e) {
 		let v = p.getString(m), y = p.dump(g), b = p.getString(_), { promise: x, resolve: S, reject: C } = e.promiseManager.create();
 		return e.triggerEvent(v, y, b).then((e) => S(e), (e) => C(e)), x.settled.then(p.runtime.executePendingJobs), x.handle;
 	}).consume((e) => p.setProp(p.global, "__triggerEventV1__", e)), p.newFunction("__getPropertyV1__", (m, g) => {
-		let _ = p.getString(m), v = p.getString(g), { promise: y, resolve: b, reject: x } = e.promiseManager.create();
-		return e.getProperty(_, v).then((e) => b(e), (e) => x(e)), y.settled.then(p.runtime.executePendingJobs), y.handle;
+		let _ = p.getString(m), v = p.getString(g);
+		return newAny(p, e.getProperty(_, v));
 	}).consume((e) => p.setProp(p.global, "__getPropertyV1__", e)), p.newFunction("__setPropertyV1__", (m, g, _) => {
 		let v = p.getString(m), y = p.dump(g), b = p.getString(_), { promise: x, resolve: S, reject: C } = e.promiseManager.create();
 		return e.setProperty(v, y, b).then((e) => S(e), (e) => C(e)), x.settled.then(p.runtime.executePendingJobs), x.handle;
@@ -10688,44 +10670,44 @@ var PromiseManager = class {
 		let _ = g.meta.slots?.find((e) => e.id === p);
 		return !_ || !_.properties ? !1 : !!_.properties.find((e) => e.id === m);
 	}
-	async getProperty(e, p) {
+	getProperty(e, p) {
 		let { kind: m, nodeId: g, propertyKey: _ } = unwrapPropertyId(e), v = this.getNode(g);
 		if (!v) throw errors.nodeNotFound;
-		if (m === "elementProperty") return await this.getElementProperty(e, v, _);
-		if (m === "refProperty") return await this.getRefProperty(e, g, _);
-		if (m === "multipleRefProperty") return await this.getMultipleRefProperty(e, g, _, p);
-		if (m === "customSlotProperty") return await this.getCustomSlotProperty(e, g, _);
-		if (m === "multipleCustomSlotProperty") return await this.getMultipleCustomSlotProperty(e, g, _, p);
-		if (m === "customProperty") return await this.getCustomProperty(e, _);
-		if (m === "elementAdaptSlotProperty") return await this.getElementAdaptSlotProperty(e, _);
-		if (m === "customAdaptSlotProperty") return await this.getCustomAdaptSlotProperty(e, _);
+		if (m === "elementProperty") return this.getElementProperty(e, v, _);
+		if (m === "refProperty") return this.getRefProperty(e, g, _);
+		if (m === "multipleRefProperty") return this.getMultipleRefProperty(e, g, _, p);
+		if (m === "customSlotProperty") return this.getCustomSlotProperty(e, g, _);
+		if (m === "multipleCustomSlotProperty") return this.getMultipleCustomSlotProperty(e, g, _, p);
+		if (m === "customProperty") return this.getCustomProperty(e, _);
+		if (m === "elementAdaptSlotProperty") return this.getElementAdaptSlotProperty(e, _);
+		if (m === "customAdaptSlotProperty") return this.getCustomAdaptSlotProperty(e, _);
 		console.assert(!1);
 	}
-	async getElementProperty(e, p, m) {
-		if (!this.isValidOfElementProperty(p.basic.key, m)) throw console.warn(`Sandbox/getElementProperty invalid element property id=${e}`), errors.invalidElementProperty;
+	getElementProperty(e, p, m) {
+		if (!this.isValidOfElementProperty(p.basic.key, m)) throw console.trace("xxxx"), console.warn(`Sandbox/getElementProperty invalid element property id=${e}`), errors.invalidElementProperty;
 		return getField(p, m);
 	}
-	async getRefProperty(e, p, m) {
+	getRefProperty(e, p, m) {
 		let g = this.children[p];
 		if (!g) throw errors.sandboxNotFound;
 		if (!g.isValidOfCustomProperty(m)) throw console.warn(`Sandbox/getRefProperty invalid custom property id=${e}`), errors.invalidCustomProperty;
 		return g.customProperties[m];
 	}
-	async getMultipleRefProperty(e, p, m, g) {
+	getMultipleRefProperty(e, p, m, g) {
 		if (!g) throw errors.instanceNotAvailable;
 		let _ = this.children[`${p}/${g}`];
 		if (!_) throw errors.sandboxNotFound;
 		if (!_.isValidOfCustomProperty(m)) throw console.warn(`Sandbox/getMultipleRefProperty invalid custom property id=${e}`), errors.invalidCustomProperty;
 		return _.customProperties[m];
 	}
-	async getCustomSlotProperty(e, p, m) {
+	getCustomSlotProperty(e, p, m) {
 		let { compId: g, slotId: _, propertyId: v } = unwrapPropertyKeyOfCustomSlot(m);
 		if (!this.isValidOfCustomSlotProperty(g, _, v)) throw console.warn(`Sandbox/getCustomSlotProperty invalid custom slot property id=${e}`), errors.invalidCustomSlotProperty;
 		let y = this.children[p];
 		if (!y) throw errors.sandboxNotFound;
 		return y.customSlotProperties[v];
 	}
-	async getMultipleCustomSlotProperty(e, p, m, g) {
+	getMultipleCustomSlotProperty(e, p, m, g) {
 		if (!g) throw errors.instanceNotAvailable;
 		let { compId: _, slotId: v, propertyId: y } = unwrapPropertyKeyOfCustomSlot(m);
 		if (!this.isValidOfCustomSlotProperty(_, v, y)) throw console.warn(`Sandbox/getMultipleCustomSlotProperty invalid custom slot property id=${e}`), errors.invalidCustomSlotProperty;
@@ -10733,11 +10715,11 @@ var PromiseManager = class {
 		if (!b) throw errors.sandboxNotFound;
 		return b.customSlotProperties[y];
 	}
-	async getCustomProperty(e, p) {
+	getCustomProperty(e, p) {
 		if (!this.isValidOfCustomProperty(p)) throw console.warn(`Sandbox/getCustomProperty invalid custom property id=${e}`), errors.invalidCustomProperty;
 		return this.customProperties[p];
 	}
-	async getElementAdaptSlotProperty(e, p) {
+	getElementAdaptSlotProperty(e, p) {
 		if (!this.parent) throw errors.notInSlot;
 		let { elementKey: m, slotKey: g, propertyKey: _ } = unwrapPropertyKeyOfElementSlot(p);
 		if (!this.isEqualOfElementSlot(m, g)) throw errors.slotIncompatible;
@@ -10745,7 +10727,7 @@ var PromiseManager = class {
 		let v = { value: void 0 };
 		return this.eventBus.emit(`property/${_}/get`, { result: v }), v.value;
 	}
-	async getCustomAdaptSlotProperty(e, p) {
+	getCustomAdaptSlotProperty(e, p) {
 		if (!this.parent) throw errors.notInSlot;
 		let { compId: m, slotId: g, propertyId: _ } = unwrapPropertyKeyOfCustomSlot(p);
 		if (!this.isEqualOfCustomSlot(m, g)) throw errors.slotIncompatible;

package/dist/sandbox/sandbox/index.d.ts

@@ -51,7 +51,7 @@ export declare class Sandbox {
     isValidOfElementSlotProperty(elementKey: string, slotKey: string, propertyKey: string): boolean;
     isValidOfCustomProperty(propertyId: string): boolean;
     isValidOfCustomSlotProperty(compId: string, slotId: string, propertyId: string): boolean;
-    getProperty(id: string, instance?: string): Promise<any>;
+    getProperty(id: string, instance?: string): any;
     private getElementProperty;
     private getRefProperty;
     private getMultipleRefProperty;

package/package.json

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