Merge pull request #7263 from damianpumar/fix/remove-proxy-function-7254

fix(core): store property descriptor handling

packages/qwik/src/core/state/store.ts

@@ -237,14 +237,20 @@ export class ReadWriteProxyHandler implements ProxyHandler<TargetType> {
         : a;
     });
   }
-
   getOwnPropertyDescriptor(
     target: TargetType,
     prop: string | symbol
   ): PropertyDescriptor | undefined {
+    const descriptor = Reflect.getOwnPropertyDescriptor(target, prop);
+
     if (isArray(target) || typeof prop === 'symbol') {
-      return Object.getOwnPropertyDescriptor(target, prop);
+      return descriptor;
     }
+
+    if (descriptor && !descriptor.configurable) {
+      return descriptor;
+    }
+
     return {
       enumerable: true,
       configurable: true,

starters/apps/qwikcity-test/src/routes/issue7254/index.tsx

@@ -0,0 +1,48 @@
+import { component$, Resource, useResource$, useStore } from "@builder.io/qwik";
+
+import { server$ } from "@builder.io/qwik-city";
+
+export interface Hello {
+  print: string;
+}
+
+const hello = server$((hello: Hello) => {
+  // Error: 'getOwnPropertyDescriptor' on proxy: trap returned descriptor for property 'print' that is incompatible with the existing property in the proxy target
+  return helloBar(hello);
+});
+
+const helloBar = server$(
+  (hello: Hello): Promise<string> =>
+    new Promise((res) => {
+      setTimeout(() => {
+        res(hello.print + " Bar");
+      }, 200);
+    }),
+);
+export default component$(() => {
+  const helloStore = useStore<Hello>({ print: "hello" });
+  const resource = useResource$(({ track }) => {
+    track(() => helloStore.print);
+
+    return hello(helloStore);
+  });
+
+  return (
+    <>
+      <Resource
+        value={resource}
+        onPending={() => <div>Loading...</div>}
+        onRejected={(error) => <div>Error: {error.message}</div>}
+        onResolved={(data) => <div>Data: {data}</div>}
+      />
+
+      <button
+        onClick$={() => {
+          helloStore.print = "Foo";
+        }}
+      >
+        Reset
+      </button>
+    </>
+  );
+});

starters/e2e/qwikcity/resource.spec.ts

@@ -0,0 +1,13 @@
+import { expect, test } from "@playwright/test";
+
+test.describe("Resource", () => {
+  test("should handle the resource correctly", async ({ page }) => {
+    await page.goto("/qwikcity-test/issue7254/");
+
+    await page.getByText("Data: hello Bar");
+
+    await page.getByRole("button", { name: "Reset" }).click();
+
+    await expect(page.getByText("Data: Foo Bar")).toBeVisible();
+  });
+});