reptree 0.4.0-alpha.0 → 0.4.0

package/dist/index.cjs

@@ -434,168 +434,39 @@ function bindVertex(tree, id, schemaOrOptions) {
   const options = isOptions ? schemaOrOptions : { schema: schemaOrOptions };
   const schema = options.schema;
   const aliases = options.aliases ?? defaultAliases;
-  const { publicToInternal, internalToPublic } = buildAliasMaps(aliases);
+  const { publicToInternal } = buildAliasMaps(aliases);
   const obj = {};
-  let isObserverUpdate = false;
-  const propsToDefine = /* @__PURE__ */ new Set();
-  if (schema?.shape) {
-    Object.keys(schema.shape).forEach((key) => propsToDefine.add(key));
-    aliases.forEach((alias) => propsToDefine.add(alias.publicKey));
-  }
-  const localValues = /* @__PURE__ */ new Map();
-  propsToDefine.forEach((publicKey) => {
-    const rule = publicToInternal.get(publicKey);
-    const internalKey = rule?.internalKey ?? publicKey;
-    const rawValue = tree.getVertexProperty(id, internalKey);
-    const publicValue = rule?.toPublic ? rule.toPublic(rawValue) : rawValue;
-    localValues.set(publicKey, publicValue);
-  });
-  propsToDefine.forEach((publicKey) => {
-    const rule = publicToInternal.get(publicKey);
-    const storageKey = `_${publicKey}_value`;
-    obj[storageKey] = localValues.get(publicKey);
-    Object.defineProperty(obj, publicKey, {
-      get: function() {
-        const internalKey = rule?.internalKey ?? publicKey;
-        const rawValue = tree.getVertexProperty(id, internalKey, true);
-        const publicValue = rule?.toPublic ? rule.toPublic(rawValue) : rawValue;
-        if (this[storageKey] !== publicValue) {
-          this[storageKey] = publicValue;
-        }
-        return publicValue;
-      },
-      set: function(value) {
-        if (schema?.shape && schema.shape[publicKey]) {
-          const field = schema.shape[publicKey];
-          if (field.safeParse) {
-            const res = field.safeParse(value);
-            if (!res.success) throw new Error(`Invalid value for ${publicKey}`);
-            value = res.data;
-          }
-        }
-        this[storageKey] = value;
-        if (!isObserverUpdate) {
-          const internalKey = rule?.internalKey ?? publicKey;
-          const internalValue = rule?.toInternal ? rule.toInternal(value) : value;
-          tree.setVertexProperty(id, internalKey, internalValue);
-        }
-      },
-      enumerable: true,
-      configurable: true
-    });
-  });
-  const cachedMethods = /* @__PURE__ */ new Map();
-  const getCachedMethod = (name, factory) => {
-    if (!cachedMethods.has(name)) {
-      cachedMethods.set(name, factory());
-    }
-    return cachedMethods.get(name);
-  };
   Object.defineProperties(obj, {
-    $id: {
-      get: () => id,
-      set: () => {
-      },
-      // No-op setter (silently ignore)
-      enumerable: false,
-      configurable: true
-    },
-    $parentId: {
-      get: () => tree.getVertex(id)?.parentId ?? null,
-      set: () => {
-      },
-      // No-op setter
-      enumerable: false,
-      configurable: true
-    },
-    $parent: {
-      get: () => tree.getVertex(id)?.parent,
-      set: () => {
-      },
-      // No-op setter
-      enumerable: false,
-      configurable: true
-    },
-    $children: {
-      get: () => tree.getChildren(id),
-      set: () => {
-      },
-      // No-op setter
-      enumerable: false,
-      configurable: true
-    },
-    $childrenIds: {
-      get: () => tree.getChildrenIds(id),
-      set: () => {
-      },
-      // No-op setter
-      enumerable: false,
-      configurable: true
-    },
+    $vertex: { get: () => tree.getVertex(id), enumerable: false, configurable: true },
+    $id: { get: () => id, enumerable: false, configurable: true },
+    $parentId: { get: () => tree.getVertex(id)?.parentId ?? null, enumerable: false, configurable: true },
+    $parent: { get: () => tree.getVertex(id)?.parent, enumerable: false, configurable: true },
+    $children: { get: () => tree.getChildren(id), enumerable: false, configurable: true },
+    $childrenIds: { get: () => tree.getChildrenIds(id), enumerable: false, configurable: true },
     $moveTo: {
-      get: () => getCachedMethod("$moveTo", () => (parent) => {
+      value: (parent) => {
         const parentId = typeof parent === "object" && parent !== null ? parent.id || parent.$id : parent;
         tree.moveVertex(id, parentId);
-      }),
-      set: () => {
       },
-      // No-op setter
       enumerable: false,
-      configurable: true
-    },
-    $delete: {
-      get: () => getCachedMethod("$delete", () => () => tree.deleteVertex(id)),
-      set: () => {
-      },
-      // No-op setter
-      enumerable: false,
-      configurable: true
-    },
-    $observe: {
-      get: () => getCachedMethod("$observe", () => (listener) => tree.observe(id, listener)),
-      set: () => {
-      },
-      // No-op setter
-      enumerable: false,
-      configurable: true
+      configurable: true,
+      writable: false
     },
+    $delete: { value: () => tree.deleteVertex(id), enumerable: false, configurable: true, writable: false },
+    $observe: { value: (listener) => tree.observe(id, listener), enumerable: false, configurable: true, writable: false },
     $observeChildren: {
-      get: () => getCachedMethod("$observeChildren", () => (listener) => {
-        return tree.observe(id, (events) => {
-          if (events.some((e) => e.type === "children")) {
-            listener(tree.getChildren(id));
-          }
-        });
+      value: (listener) => tree.observe(id, (events) => {
+        if (events.some((e) => e.type === "children")) {
+          listener(tree.getChildren(id));
+        }
       }),
-      set: () => {
-      },
-      // No-op setter
       enumerable: false,
-      configurable: true
+      configurable: true,
+      writable: false
     },
-    $newChild: {
-      get: () => getCachedMethod("$newChild", () => (props) => {
-        const vertex = tree.getVertex(id);
-        return vertex?.newChild(props);
-      }),
-      set: () => {
-      },
-      // No-op setter
-      enumerable: false,
-      configurable: true
-    },
-    $newNamedChild: {
-      get: () => getCachedMethod("$newNamedChild", () => (name, props) => {
-        const vertex = tree.getVertex(id);
-        return vertex?.newNamedChild(name, props);
-      }),
-      set: () => {
-      },
-      // No-op setter
-      enumerable: false,
-      configurable: true
-    },
-    useTransient: {
+    $newChild: { value: (props) => tree.getVertex(id).newChild(props), enumerable: false, configurable: true, writable: false },
+    $newNamedChild: { value: (name, props) => tree.getVertex(id).newNamedChild(name, props), enumerable: false, configurable: true, writable: false },
+    $useTransients: {
       value: function(fn) {
         const transientProxy = new Proxy({}, {
           set(_, prop, value) {
@@ -618,103 +489,60 @@ function bindVertex(tree, id, schemaOrOptions) {
         fn(transientProxy);
       },
       enumerable: false,
-      configurable: true
-    },
-    commitTransients: {
-      value: function() {
-        tree.commitTransients(id);
-      },
-      enumerable: false,
-      configurable: true
+      configurable: true,
+      writable: false
     },
+    $commitTransients: { value: () => tree.commitTransients(id), enumerable: false, configurable: true, writable: false },
     equals: {
       value: function(other) {
         if (other && typeof other === "object" && "$id" in other) {
           return other.$id === id;
         }
-        return obj === other;
+        return false;
       },
       enumerable: false,
-      configurable: true
+      configurable: true,
+      writable: false
     }
   });
-  tree.observe(id, (events) => {
-    isObserverUpdate = true;
-    for (const e of events) {
-      if (e.type === "property") {
-        const propEvent = e;
-        const rule = internalToPublic.get(propEvent.key);
-        if (rule) {
-          const publicKey = rule.publicKey;
-          const publicValue = rule.toPublic ? rule.toPublic(propEvent.value) : propEvent.value;
-          const storageKey = `_${publicKey}_value`;
-          if (storageKey in obj) {
-            obj[storageKey] = publicValue;
-          }
-        }
-      }
-    }
-    isObserverUpdate = false;
-  });
-  if (schema) {
-    return obj;
-  }
   const proxy = new Proxy(obj, {
-    get(target, prop) {
+    get(target, prop, receiver) {
       if (typeof prop !== "string") {
-        return target[prop];
+        return Reflect.get(target, prop, receiver);
       }
-      if (prop in target || prop.startsWith("$") || prop === "equals") {
-        return target[prop];
+      if (prop in target) {
+        return Reflect.get(target, prop, receiver);
       }
       const rule = publicToInternal.get(prop);
-      if (rule) {
-        const internalKey = rule.internalKey;
-        const rawValue2 = tree.getVertexProperty(id, internalKey);
-        const result = rule.toPublic ? rule.toPublic(rawValue2) : rawValue2;
-        return result;
-      }
-      const rawValue = tree.getVertexProperty(id, prop);
-      return rawValue;
+      const internalKey = rule?.internalKey ?? prop;
+      const rawValue = tree.getVertexProperty(id, internalKey, true);
+      return rule?.toPublic ? rule.toPublic(rawValue) : rawValue;
     },
     set(target, prop, value) {
       if (typeof prop !== "string") {
-        target[prop] = value;
-        return true;
-      }
-      const descriptor = Object.getOwnPropertyDescriptor(target, prop);
-      if (descriptor && descriptor.set) {
-        target[prop] = value;
-        return true;
+        return Reflect.set(target, prop, value);
+      }
+      if (schema?.shape && schema.shape[prop]) {
+        const field = schema.shape[prop];
+        if (field.safeParse) {
+          const res = field.safeParse(value);
+          if (!res.success) throw new Error(`Invalid value for ${prop}`);
+          value = res.data;
+        }
       }
       const rule = publicToInternal.get(prop);
-      if (rule) {
-        const internalKey = rule.internalKey;
-        const internalValue = rule.toInternal ? rule.toInternal(value) : value;
-        tree.setVertexProperty(id, internalKey, internalValue);
-        return true;
-      }
-      tree.setVertexProperty(id, prop, value);
+      const internalKey = rule?.internalKey ?? prop;
+      const internalValue = rule?.toInternal ? rule.toInternal(value) : value;
+      tree.setVertexProperty(id, internalKey, internalValue);
       return true;
     },
-    deleteProperty(target, prop) {
+    deleteProperty(_target, prop) {
       if (typeof prop !== "string") {
-        delete target[prop];
         return true;
       }
-      const storageKey = `_${prop}_value`;
-      if (storageKey in target) {
-        delete target[storageKey];
-      }
-      if (prop in target) {
-        delete target[prop];
-      }
       const rule = publicToInternal.get(prop);
-      if (rule) {
-        tree.setVertexProperty(id, rule.internalKey, void 0);
-        return true;
-      }
-      tree.setVertexProperty(id, prop, void 0);
+      const internalKey = rule?.internalKey ?? prop;
+      tree.setVertexProperty(id, internalKey, void 0);
       return true;
     }
   });