From 7e5011ff86cbc5426ec5624370a52d75d43dc190 Mon Sep 17 00:00:00 2001
From: unnoq <contact@unnoq.com>
Date: Tue, 19 Nov 2024 09:24:34 +0700
Subject: [PATCH] fix(shared): get utils not work on function

---
 .changeset/proud-ghosts-listen.md |  5 +++++
 .changeset/red-rice-talk.md       |  5 +++++
 packages/shared/src/object.ts     | 10 ++++++++--
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/proud-ghosts-listen.md
 create mode 100644 .changeset/red-rice-talk.md

diff --git a/.changeset/proud-ghosts-listen.md b/.changeset/proud-ghosts-listen.md
new file mode 100644
index 00000000..01a9f35b
--- /dev/null
+++ b/.changeset/proud-ghosts-listen.md
@@ -0,0 +1,5 @@
+---
+"@orpc/shared": patch
+---
+
+fix: get utils not work on function
diff --git a/.changeset/red-rice-talk.md b/.changeset/red-rice-talk.md
new file mode 100644
index 00000000..3384c54b
--- /dev/null
+++ b/.changeset/red-rice-talk.md
@@ -0,0 +1,5 @@
+---
+"@orpc/server": patch
+---
+
+fix: dynamic params not work well
diff --git a/packages/shared/src/object.ts b/packages/shared/src/object.ts
index 2bf0a597..4013d607 100644
--- a/packages/shared/src/object.ts
+++ b/packages/shared/src/object.ts
@@ -32,7 +32,10 @@ export function get(
   let preSegment: string | number = 'root'
 
   for (const segment of segments) {
-    if (typeof currentRef !== 'object' || currentRef === null) {
+    if (
+      (typeof currentRef !== 'object' && typeof currentRef !== 'function') ||
+      currentRef === null
+    ) {
       return undefined
     }
 
@@ -40,7 +43,10 @@ export function get(
     preSegment = segment
   }
 
-  if (typeof currentRef !== 'object' || currentRef === null) {
+  if (
+    (typeof currentRef !== 'object' && typeof currentRef !== 'function') ||
+    currentRef === null
+  ) {
     return undefined
   }