opshot 0.5.2 → 0.5.3

package/dist/index.js

@@ -98,6 +98,28 @@ function classifyValue(value) {
   return classifyChain(value.constructor);
 }
 
+// src/readProxyRegistry.ts
+var readProxyTargets = /* @__PURE__ */ new WeakMap();
+var registerReadProxyTarget = (readProxy, target) => {
+  readProxyTargets.set(readProxy, target);
+};
+var getRegisteredReadProxyTarget = (readProxy) => readProxyTargets.get(readProxy);
+
+// src/utils/predicates.ts
+var isObjectLike = (value) => value !== null && (typeof value === "object" || typeof value === "function");
+
+// src/peelReadProxy.ts
+function peelReadProxy(value) {
+  if (!isObjectLike(value)) return value;
+  let current = value;
+  while (isObjectLike(current)) {
+    const registeredTarget = getRegisteredReadProxyTarget(current);
+    if (registeredTarget === void 0) break;
+    current = registeredTarget;
+  }
+  return current;
+}
+
 // src/node.ts
 var byRaw = /* @__PURE__ */ new WeakMap();
 var byProxy = /* @__PURE__ */ new WeakMap();
@@ -106,10 +128,11 @@ function installProxyHandler(handler2) {
   proxyHandler = handler2;
 }
 function recordOf(value) {
-  return byRaw.get(value) ?? byProxy.get(value);
+  const peeled = peelReadProxy(value);
+  return byRaw.get(peeled) ?? byProxy.get(peeled);
 }
 function rawOf(value) {
-  return recordOf(value)?.raw ?? value;
+  return recordOf(value)?.raw ?? peelReadProxy(value);
 }
 function proxyOf(raw) {
   const existing = recordOf(raw);
@@ -257,83 +280,9 @@ function evict(handle, node) {
   cascade(handle, rawNode, membership.keys);
 }
 
-// src/utils/predicates.ts
-var isObjectLike = (value) => value !== null && (typeof value === "object" || typeof value === "function");
-
-// src/identity.ts
-var readProxyTargets = /* @__PURE__ */ new WeakMap();
-var identityRecords = /* @__PURE__ */ new WeakMap();
-var nextInternId = 0;
-var registerReadProxyTarget = (readProxy, target) => {
-  readProxyTargets.set(readProxy, target);
-};
-var getRegisteredReadProxyTarget = (readProxy) => readProxyTargets.get(readProxy);
-function resolveIdentity(value) {
-  let current = value;
-  while (isObjectLike(current)) {
-    const readTarget = getRegisteredReadProxyTarget(current);
-    if (readTarget !== void 0 && readTarget !== current) {
-      current = readTarget;
-      continue;
-    }
-    const raw = rawOf(current);
-    if (raw !== current) {
-      current = raw;
-      continue;
-    }
-    break;
-  }
-  return current;
-}
-var recordFor = (key) => {
-  let record = identityRecords.get(key);
-  if (record === void 0) {
-    record = {};
-    identityRecords.set(key, record);
-  }
-  return record;
-};
-function identify(value) {
-  const target = resolveIdentity(value);
-  if (!isObjectLike(target)) return value;
-  const record = recordFor(target);
-  if (record.token !== void 0) return record.token;
-  const token = Object.freeze({});
-  record.token = token;
-  return token;
-}
-var internIdentity = (key) => {
-  const resolved = resolveIdentity(key);
-  const record = recordFor(resolved);
-  if (record.id !== void 0) return record.id;
-  const id = nextInternId;
-  nextInternId += 1;
-  record.id = id;
-  return id;
-};
-function isSameIdentity(first, second) {
-  const resolvedFirst = resolveIdentity(first);
-  const resolvedSecond = resolveIdentity(second);
-  return resolvedFirst === resolvedSecond;
-}
-
-// src/peelReadProxy.ts
-function peelReadProxy(value) {
-  if (!isObjectLike(value)) return value;
-  let current = value;
-  while (isObjectLike(current)) {
-    const registeredTarget = getRegisteredReadProxyTarget(current);
-    if (registeredTarget === void 0) break;
-    current = registeredTarget;
-  }
-  return current;
-}
-
 // src/handle.ts
 function handleOf(state) {
-  const peeled = peelReadProxy(state);
-  if (!isObjectLike(peeled)) return void 0;
-  const raw = rawOf(peeled);
+  const raw = rawOf(state);
   const record = recordOf(raw);
   if (record === void 0) return void 0;
   for (const handle of record.memberships.keys()) {
@@ -683,6 +632,58 @@ function createMutableState(properties, options) {
   return proxy;
 }
 
+// src/identity.ts
+var identityRecords = /* @__PURE__ */ new WeakMap();
+var nextInternId = 0;
+function resolveIdentity(value) {
+  let current = value;
+  while (isObjectLike(current)) {
+    const readTarget = getRegisteredReadProxyTarget(current);
+    if (readTarget !== void 0 && readTarget !== current) {
+      current = readTarget;
+      continue;
+    }
+    const raw = rawOf(current);
+    if (raw !== current) {
+      current = raw;
+      continue;
+    }
+    break;
+  }
+  return current;
+}
+var recordFor = (key) => {
+  let record = identityRecords.get(key);
+  if (record === void 0) {
+    record = {};
+    identityRecords.set(key, record);
+  }
+  return record;
+};
+function identify(value) {
+  const target = resolveIdentity(value);
+  if (!isObjectLike(target)) return value;
+  const record = recordFor(target);
+  if (record.token !== void 0) return record.token;
+  const token = Object.freeze({});
+  record.token = token;
+  return token;
+}
+var internIdentity = (key) => {
+  const resolved = resolveIdentity(key);
+  const record = recordFor(resolved);
+  if (record.id !== void 0) return record.id;
+  const id = nextInternId;
+  nextInternId += 1;
+  record.id = id;
+  return id;
+};
+function isSameIdentity(first, second) {
+  const resolvedFirst = resolveIdentity(first);
+  const resolvedSecond = resolveIdentity(second);
+  return resolvedFirst === resolvedSecond;
+}
+
 // src/isState.ts
 function isState(value) {
   const resolved = peelReadProxy(value);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "opshot",
-	"version": "0.5.2",
+	"version": "0.5.3",
 	"description": "Plain-object state for React: mutate it directly, re-render only the components that read what changed, and track every change operation",
 	"type": "module",
 	"exports": {