@rs-x/vue 2.0.0-next.6 → 2.0.0-next.60

package/dist/index.d.ts

@@ -8,4 +8,7 @@ declare function getExpressionManager(): IExpressionManager;
 
 declare function useRsxExpression<T>(expression: IExpression<T>): vue.Ref<any, any> extends T | null ? vue.ShallowRef<null, null> | (T extends T & vue.Ref<any, any> ? _vue_shared.IfAny<T, vue.ShallowRef<T, T>, T> : vue.ShallowRef<T, T>) : vue.ShallowRef<T | null, T | null>;
 
-export { getExpressionFactory, getExpressionManager, useRsxExpression };
+type FieldFilter = (model: object, field: string) => boolean;
+declare function useRsxModel<TModel extends object>(model: TModel, mustWatch?: FieldFilter): TModel;
+
+export { type FieldFilter, getExpressionFactory, getExpressionManager, useRsxExpression, useRsxModel };

package/dist/index.js

@@ -7,7 +7,7 @@ import { RsXExpressionParserInjectionTokens, RsXExpressionParserModule } from "@
 var factoryInstance;
 function getExpressionFactory() {
   if (!factoryInstance) {
-    if (!InjectionContainer.isBound(RsXExpressionParserInjectionTokens.IExpressionFactory)) {
+    if (!InjectionContainer.isBound(RsXExpressionParserInjectionTokens.IExpressionParser)) {
       InjectionContainer.load(RsXExpressionParserModule);
     }
     factoryInstance = InjectionContainer.get(RsXExpressionParserInjectionTokens.IExpressionFactory);
@@ -22,7 +22,7 @@ import { RsXExpressionParserInjectionTokens as RsXExpressionParserInjectionToken
 var expressionManager;
 function getExpressionManager() {
   if (!expressionManager) {
-    if (!InjectionContainer2.isBound(RsXExpressionParserInjectionTokens2.IExpressionManager)) {
+    if (!InjectionContainer2.isBound(RsXExpressionParserInjectionTokens2.IExpressionParser)) {
       InjectionContainer2.load(RsXExpressionParserModule2);
     }
     expressionManager = InjectionContainer2.get(RsXExpressionParserInjectionTokens2.IExpressionManager);
@@ -33,15 +33,18 @@ __name(getExpressionManager, "getExpressionManager");
 
 // src/hooks/use-rsx-expression.ts
 import { getCurrentScope, onScopeDispose, shallowRef } from "vue";
-import { AbstractExpression } from "@rs-x/expression-parser";
+import { AbstractExpression, CompiledExpression } from "@rs-x/expression-parser";
 function useRsxExpression(expression) {
-  if (!(expression instanceof AbstractExpression)) {
+  if (!(expression instanceof AbstractExpression) && !(expression instanceof CompiledExpression)) {
     throw new Error("useRsxExpression: expression must be an IExpression");
   }
   const expressionTree = expression;
-  const value = shallowRef(expressionTree.value ?? null);
+  const getCurrentValue = /* @__PURE__ */ __name(() => {
+    return expressionTree.value ?? null;
+  }, "getCurrentValue");
+  const value = shallowRef(getCurrentValue());
   const subscription = expressionTree.changed.subscribe(() => {
-    value.value = expressionTree.value ?? null;
+    value.value = getCurrentValue();
   });
   if (getCurrentScope()) {
     onScopeDispose(() => {
@@ -51,8 +54,72 @@ function useRsxExpression(expression) {
   return value;
 }
 __name(useRsxExpression, "useRsxExpression");
+
+// src/hooks/use-rsx-model.ts
+import { getCurrentInstance, getCurrentScope as getCurrentScope2, markRaw, onScopeDispose as onScopeDispose2 } from "vue";
+import { truePredicate, Type, UnsupportedException } from "@rs-x/core";
+import { rsx } from "@rs-x/expression-parser";
+function useRsxModel(model, mustWatch) {
+  const expressionCache = /* @__PURE__ */ new Map();
+  const subscriptions = [];
+  const shouldWatch = mustWatch ?? truePredicate;
+  const currentInstance = getCurrentInstance();
+  const forceUpdate = /* @__PURE__ */ __name(() => {
+    currentInstance?.proxy?.$forceUpdate();
+  }, "forceUpdate");
+  const getOrCreateExpression = /* @__PURE__ */ __name((parent, field) => {
+    let fieldMap = expressionCache.get(parent);
+    if (!fieldMap) {
+      fieldMap = /* @__PURE__ */ new Map();
+      expressionCache.set(parent, fieldMap);
+    }
+    let expression = fieldMap.get(field);
+    if (!expression) {
+      expression = rsx(field)(parent);
+      fieldMap.set(field, expression);
+    }
+    return expression;
+  }, "getOrCreateExpression");
+  const disposeExpressions = /* @__PURE__ */ __name(() => {
+    for (const subscription of subscriptions) {
+      subscription.unsubscribe();
+    }
+    for (const fieldMap of expressionCache.values()) {
+      for (const expression of fieldMap.values()) {
+        expression.dispose();
+      }
+    }
+  }, "disposeExpressions");
+  if (getCurrentScope2()) {
+    onScopeDispose2(() => {
+      disposeExpressions();
+    });
+  }
+  const bindObject = /* @__PURE__ */ __name((sourceObject) => {
+    for (const [field, value] of Object.entries(sourceObject)) {
+      if (!shouldWatch(sourceObject, field) || Type.isMethod(value) || Type.isArrowFunction(value)) {
+        continue;
+      }
+      if (Type.isIterableCollection(value)) {
+        throw new UnsupportedException("Collections are not supported by useRsxModel yet.");
+      }
+      if (Type.isPlainObject(value)) {
+        bindObject(value);
+        continue;
+      }
+      const expression = getOrCreateExpression(sourceObject, field);
+      subscriptions.push(expression.changed.subscribe(() => {
+        forceUpdate();
+      }));
+    }
+  }, "bindObject");
+  bindObject(model);
+  return markRaw(model);
+}
+__name(useRsxModel, "useRsxModel");
 export {
   getExpressionFactory,
   getExpressionManager,
-  useRsxExpression
+  useRsxExpression,
+  useRsxModel
 };

package/package.json

@@ -1,16 +1,22 @@
 {
   "name": "@rs-x/vue",
-  "version": "2.0.0-next.6",
+  "version": "2.0.0-next.60",
   "description": "Vue extension for the RS-X framework with composables to bind RS-X expressions to Vue components",
   "type": "module",
   "main": "./dist/index.js",
-  "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.js"
-    }
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./testing": {
+      "types": "./dist/testing/index.d.ts",
+      "import": "./dist/testing/index.js",
+      "default": "./dist/testing/index.js"
+    },
+    "./package.json": "./package.json"
   },
   "sideEffects": false,
   "files": [
@@ -32,24 +38,24 @@
     "vue": ">=3.3.0"
   },
   "dependencies": {
-    "@rs-x/core": "2.0.0-next.6",
-    "@rs-x/state-manager": "2.0.0-next.6",
-    "@rs-x/expression-parser": "2.0.0-next.6"
+    "@rs-x/core": "2.0.0-next.60",
+    "@rs-x/state-manager": "2.0.0-next.60",
+    "@rs-x/expression-parser": "2.0.0-next.60"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^6.0.1",
-    "eslint": "^10.0.1",
-    "eslint-plugin-vue": "^10.5.1",
-    "globals": "^17.3.0",
+    "@vitejs/plugin-vue": "^6.0.5",
+    "eslint": "^10.2.0",
+    "eslint-plugin-vue": "^10.8.0",
+    "globals": "^17.4.0",
     "prettier": "^3.8.1",
     "rimraf": "^6.1.3",
     "tsup": "^8.5.1",
-    "typescript": "^5.9.3",
-    "vite": "^7.3.1",
+    "typescript": "^6.0.2",
+    "vite": "^8.0.7",
     "vite-tsconfig-paths": "^6.1.1",
-    "vue-eslint-parser": "^10.2.0",
-    "vitest": "^4.0.18",
-    "vue": "^3.5.0"
+    "vitest": "^4.1.3",
+    "vue": "^3.5.32",
+    "vue-eslint-parser": "^10.4.0"
   },
   "engines": {
     "node": ">=24"
@@ -63,7 +69,7 @@
     "composable"
   ],
   "scripts": {
-    "build": "tsup src/index.ts --format esm --dts --external vue --tsconfig ../tsconfig.build.json",
+    "build": "tsup src/index.ts --format esm --dts --external vue",
     "test": "vitest run",
     "clean": "rimraf dist"
   }