x-runtime-lib 0.8.201 → 0.8.203

package/dist/index.js

@@ -10313,12 +10313,35 @@ function unwrapTriggerId(e) {
 		triggerKey: p[1]
 	};
 }
+async function initReactivity(e, p) {
+	await initWatchEffect(e, p), await initBind(e, p);
+}
+async function initWatchEffect(e, p) {
+	let { watchEffect: m } = p;
+	for (let p of m.ids) {
+		let m = encodeString(p);
+		await e.callFunctionAsync(`__watchEffect$${m}__`);
+	}
+}
+async function initBind(e, p) {
+	let { bind: m } = p;
+	for (let p in m.sets) {
+		let g = m.sets[p];
+		if (g.length < 2) continue;
+		let _, { kind: v, triggerKey: y } = unwrapTriggerId(g[0]);
+		v === "propertyTrigger" ? _ = await e.getProperty(y) : v === "stateTrigger" ? _ = await e.getState(y) : console.assert(!1);
+		for (let p of g) {
+			let { kind: m, triggerKey: g } = unwrapTriggerId(p);
+			m === "propertyTrigger" ? await e.setProperty(g, _) : m === "stateTrigger" ? await e.setState(g, _) : console.assert(!1);
+		}
+	}
+}
 async function triggerReactivity(e, p, m, g, _) {
 	await triggerWatchEffect(e, p, m), await triggerBind(e, p, m, g, _);
 }
 async function triggerWatchEffect(e, p, m) {
 	let { watchEffect: g } = p;
-	if (g[m]) for (let p of g[m]) {
+	if (g.triggers[m]) for (let p of g.triggers[m]) {
 		let m = encodeString(p);
 		await e.callFunctionAsync(`__watchEffect$${m}__`);
 	}
@@ -10663,7 +10686,7 @@ var PromiseManager = class {
 		return this.data.value?.view.nodes[e];
 	}
 	async createVm(e, p) {
-		this.vm = e.newContext(), this.promiseManager = new PromiseManager(this.vm), bind(this), this.vm.evalCode("\nlet __events__ = {}\n\nfunction __onEventV1__(id, callback) {\n  if (typeof(id) !== 'string' || !id) {\n    return\n  }\n  if (typeof(callback) !== 'function') {\n    return\n  }\n  if (!__events__[id]) {\n    __events__[id] = []\n  }\n  const callbacks = __events__[id]\n  for (let i = 0; i < callbacks.length; i++) {\n    if (callbacks[i] === callback) {\n      return\n    }\n  }\n  callbacks.push(callback)\n}\n\nasync function __triggerEventInner__(id, params, instance) {\n  if (!__events__[id]) {\n    return\n  }\n  const callbacks = __events__[id]\n  if (!callbacks) {\n    return\n  }\n  for (let i = 0; i < callbacks.length; i++) {\n    await callbacks[i](params, instance)\n  }\n}\n\nlet __timers__ = {}\nlet __currTimerId__ = 0\n\nfunction __createTimerV1__(interval, loop, count, immediate, callback) {\n  if (!loop && count <= 0) {\n    return\n  }\n  const timer = {}\n  timer.id = __currTimerId__++\n  timer.interval = interval\n  timer.loop = loop\n  timer.count = count\n  timer.immediate = immediate\n  timer.callback = callback\n  __timers__[timer.id] = timer\n  if (timer.immediate) {\n    __timeoutCallbackV1__(timer.id)\n  } else {\n    __timeoutV1__(timer.id, timer.interval)\n  }\n}\n\nasync function __timeoutCallback__(timerId) {\n  const timer = __timers__[timerId]\n  if (timer) {\n    timer.callback()\n    // 修改计数\n    if (!timer.loop) {\n      timer.count = timer.count - 1\n    }\n    // 触发超时\n    if (timer.loop || timer.count > 0) {\n      await __timeoutV1__(timer.id, timer.interval)\n    }\n    // 回收\n    if (!timer.loop && timer.count <= 0) {\n      delete __timers__[timer.id]\n    }\n  }\n}\n\nfunction __destroy__() {\n  __events__ = {}\n  __timers__ = {}\n}\n"), this.setGlobalVariable("__env__", this.env), this.vm.evalCode(p), await nextTick(), this.hooks.onReady();
+		this.vm = e.newContext(), this.promiseManager = new PromiseManager(this.vm), bind(this), this.vm.evalCode("\nlet __events__ = {}\n\nfunction __onEventV1__(id, callback) {\n  if (typeof(id) !== 'string' || !id) {\n    return\n  }\n  if (typeof(callback) !== 'function') {\n    return\n  }\n  if (!__events__[id]) {\n    __events__[id] = []\n  }\n  const callbacks = __events__[id]\n  for (let i = 0; i < callbacks.length; i++) {\n    if (callbacks[i] === callback) {\n      return\n    }\n  }\n  callbacks.push(callback)\n}\n\nasync function __triggerEventInner__(id, params, instance) {\n  if (!__events__[id]) {\n    return\n  }\n  const callbacks = __events__[id]\n  if (!callbacks) {\n    return\n  }\n  for (let i = 0; i < callbacks.length; i++) {\n    await callbacks[i](params, instance)\n  }\n}\n\nlet __timers__ = {}\nlet __currTimerId__ = 0\n\nfunction __createTimerV1__(interval, loop, count, immediate, callback) {\n  if (!loop && count <= 0) {\n    return\n  }\n  const timer = {}\n  timer.id = __currTimerId__++\n  timer.interval = interval\n  timer.loop = loop\n  timer.count = count\n  timer.immediate = immediate\n  timer.callback = callback\n  __timers__[timer.id] = timer\n  if (timer.immediate) {\n    __timeoutCallbackV1__(timer.id)\n  } else {\n    __timeoutV1__(timer.id, timer.interval)\n  }\n}\n\nasync function __timeoutCallback__(timerId) {\n  const timer = __timers__[timerId]\n  if (timer) {\n    timer.callback()\n    // 修改计数\n    if (!timer.loop) {\n      timer.count = timer.count - 1\n    }\n    // 触发超时\n    if (timer.loop || timer.count > 0) {\n      await __timeoutV1__(timer.id, timer.interval)\n    }\n    // 回收\n    if (!timer.loop && timer.count <= 0) {\n      delete __timers__[timer.id]\n    }\n  }\n}\n\nfunction __destroy__() {\n  __events__ = {}\n  __timers__ = {}\n}\n"), this.setGlobalVariable("__env__", this.env), this.vm.evalCode(p), this.data.value?.code.reactivity && await initReactivity(this, this.data.value?.code.reactivity), await nextTick(), this.hooks.onReady();
 	}
 	destroyVm() {
 		this.vm && this.hooks.onDestroy(), this.promiseManager &&= (this.promiseManager.dispose(), void 0), this.vm &&= (this.vm.dispose(), void 0);
@@ -11114,7 +11137,7 @@ var PromiseManager = class {
 	}
 	states = {};
 	resetStates() {
-		this.states = {};
+		if (this.states = {}, this.meta.value?.states) for (let { id: e, type: p } of this.meta.value.states) this.states[e] = getTypeDefault(p);
 	}
 	isValidOfState(e) {
 		return this.meta.value ? !!this.meta.value.states?.find((p) => p.id === e) : !1;
@@ -11195,4 +11218,4 @@ async function loadLocaleMessageRuntime(e) {
 		"./locales/zhHans/index.ts": () => import("./zhHans.gwvwcjmv.js")
 	}, `./locales/${e}/index.ts`, 4)).default;
 }
-export { addIndent, ambientLightV1, badgeV1, barChartV1, boxGeometryV1, breakpoints, btnGroupV1, btnToggleV1, btnV1, calcBreakpoint, cardV1, checkboxV1, chipGroupV1, chipV1, colorPickerV1, comboboxV1, compTypes, containerV1, dataStringify, dataTableV1, datePickerV1, dialogV1, directionalLightV1, duplicateNodePair, duplicateNodePairs, elementKeys, fileInputV1, finalProperties, flexLayoutEntryV1, flexLayoutV1, formV1, fromDotString, genId, getAllElements, getBreakpointProp, getElement, getElementMust, getField, getImplementMethodName, getIndexOfBreakpoint, getNodeLite, getProperties, getPropertyDefault, getTag, globalityV1, groupV1, hasComp, hasSlot, iconV1, initNode, initProperties, injectDark, injectData, injectDepends, injectDevice, injectEnv, injectId, injectMeta, injectMode, injectNode, injectOrg, injectRuntime, injectSandbox, injectType, isCircularReference, isExecutableMode, isPercentStr, isPixelStr, keyboardControlsV1, lineChartV1, loadLocaleMessageRuntime, makeEventId, makeEventKeyOfCustomSlot, makeEventKeyOfElementSlot, makeMethodId, makeMethodKeyOfCustomSlot, makeMethodKeyOfElementSlot, makePropertyId, makePropertyKeyOfCustomSlot, makePropertyKeyOfElementSlot, makeSlotId, makeTriggerId, mapControlsV1, menuV1, meshBasicMaterialV1, meshV1, metaStringify, multipleRefV1, multipleSlotV1, numberInputV1, orbitControlsV1, orthographicCameraV1, pageTypes, paginationV1, parseData, parseMeta, parsePercentStr, parsePixelStr, perspectiveCameraV1, pkgs, pointLightV1, provideDark, provideData, provideDepends, provideDevice, provideEnv, provideId, provideMeta, provideMode, provideNode, provideOrg, provideRuntime, provideSandbox, provideType, radioGroupV1, radioV1, rangeSliderV1, ratingV1, referenceV1, regElement, renderSwitchV1, reverseBreakpoints, selectV1, setField, sliderV1, slotV1, spawnNode, sphereGeometryV1, spotLightV1, stepperHeaderV1, stepperItemV1, stepperV1, stepperWindowItemV1, stepperWindowV1, switchV1, tabV1, tabsV1, textFieldV1, textV1, textareaV1, timelineItemV1, timelineV1, toDotString, toEventName, toMethodName, toNodeLite, toPropertyName, triggerReactivity, unwrapEventId, unwrapEventKeyOfCustomSlot, unwrapEventKeyOfElementSlot, unwrapMethodId, unwrapMethodKeyOfCustomSlot, unwrapMethodKeyOfElementSlot, unwrapPropertyId, unwrapPropertyKeyOfCustomSlot, unwrapPropertyKeyOfElementSlot, unwrapSlotId, unwrapTriggerId, useDepend, useRuntime, useSandbox, useTheme, windowItemV1, windowV1 };
+export { addIndent, ambientLightV1, badgeV1, barChartV1, boxGeometryV1, breakpoints, btnGroupV1, btnToggleV1, btnV1, calcBreakpoint, cardV1, checkboxV1, chipGroupV1, chipV1, colorPickerV1, comboboxV1, compTypes, containerV1, dataStringify, dataTableV1, datePickerV1, dialogV1, directionalLightV1, duplicateNodePair, duplicateNodePairs, elementKeys, fileInputV1, finalProperties, flexLayoutEntryV1, flexLayoutV1, formV1, fromDotString, genId, getAllElements, getBreakpointProp, getElement, getElementMust, getField, getImplementMethodName, getIndexOfBreakpoint, getNodeLite, getProperties, getPropertyDefault, getTag, globalityV1, groupV1, hasComp, hasSlot, iconV1, initNode, initProperties, initReactivity, injectDark, injectData, injectDepends, injectDevice, injectEnv, injectId, injectMeta, injectMode, injectNode, injectOrg, injectRuntime, injectSandbox, injectType, isCircularReference, isExecutableMode, isPercentStr, isPixelStr, keyboardControlsV1, lineChartV1, loadLocaleMessageRuntime, makeEventId, makeEventKeyOfCustomSlot, makeEventKeyOfElementSlot, makeMethodId, makeMethodKeyOfCustomSlot, makeMethodKeyOfElementSlot, makePropertyId, makePropertyKeyOfCustomSlot, makePropertyKeyOfElementSlot, makeSlotId, makeTriggerId, mapControlsV1, menuV1, meshBasicMaterialV1, meshV1, metaStringify, multipleRefV1, multipleSlotV1, numberInputV1, orbitControlsV1, orthographicCameraV1, pageTypes, paginationV1, parseData, parseMeta, parsePercentStr, parsePixelStr, perspectiveCameraV1, pkgs, pointLightV1, provideDark, provideData, provideDepends, provideDevice, provideEnv, provideId, provideMeta, provideMode, provideNode, provideOrg, provideRuntime, provideSandbox, provideType, radioGroupV1, radioV1, rangeSliderV1, ratingV1, referenceV1, regElement, renderSwitchV1, reverseBreakpoints, selectV1, setField, sliderV1, slotV1, spawnNode, sphereGeometryV1, spotLightV1, stepperHeaderV1, stepperItemV1, stepperV1, stepperWindowItemV1, stepperWindowV1, switchV1, tabV1, tabsV1, textFieldV1, textV1, textareaV1, timelineItemV1, timelineV1, toDotString, toEventName, toMethodName, toNodeLite, toPropertyName, triggerReactivity, unwrapEventId, unwrapEventKeyOfCustomSlot, unwrapEventKeyOfElementSlot, unwrapMethodId, unwrapMethodKeyOfCustomSlot, unwrapMethodKeyOfElementSlot, unwrapPropertyId, unwrapPropertyKeyOfCustomSlot, unwrapPropertyKeyOfElementSlot, unwrapSlotId, unwrapTriggerId, useDepend, useRuntime, useSandbox, useTheme, windowItemV1, windowV1 };

package/dist/types/data.d.ts

@@ -29,18 +29,12 @@ export interface View {
         [key: string]: Node;
     };
 }
-interface TriggerProperty {
-    type: 'property';
-    propertyId: string;
-}
-interface TriggerState {
-    type: 'state';
-    stateId: string;
-}
-export type Trigger = TriggerProperty | TriggerState;
 export interface Reactivity {
     watchEffect: {
-        [key: string]: string[];
+        ids: string[];
+        triggers: {
+            [key: string]: string[];
+        };
     };
     bind: {
         sets: {
@@ -64,4 +58,3 @@ export interface Data {
 }
 export declare function dataStringify({ type, version, view, code }: Data): string;
 export declare function parseData(str: string): Data;
-export {};

package/dist/utils/reactivity.d.ts

@@ -1,3 +1,4 @@
 import { Sandbox } from '@/sandbox';
 import { Reactivity } from '@/types';
+export declare function initReactivity(sandbox: Sandbox, reactivity: Reactivity): Promise<void>;
 export declare function triggerReactivity(sandbox: Sandbox, reactivity: Reactivity, triggerId: string, newValue: any, oldValue: any): Promise<void>;

package/package.json

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