preserve getter while resolving plugin

riccardoperra · Nov 5, 2024 · c48a715 · c48a715
1 parent 953f7da
commit c48a715
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 5 deletions.
diff --git a/packages/state/src/api.ts b/packages/state/src/api.ts
@@ -94,7 +94,9 @@ export function resolve<
     // full control of the property for future Plugin updates
     for (const p in resolvedContext) {
       if (p === 'set' && typeof resolvedContext[p] !== 'function') continue;
-      resolvedStore[p as keyof typeof resolvedStore] = resolvedContext[p];
+
+      const descriptor = Object.getOwnPropertyDescriptor(resolvedContext, p);
+      Object.defineProperty(resolvedStore, p, descriptor ?? resolvedContext[p]);
     }
 
     resolvedPlugins.push(extensionCreator.name);

diff --git a/packages/state/test/api.test.ts b/packages/state/test/api.test.ts
@@ -124,6 +124,23 @@ describe('resolve', () => {
     expect(setFn).toHaveBeenCalledWith(10);
   });
 
+  it('will preserve getters', () => {
+    const state = defineSignal(() => 0).extend((api) => {
+      return {
+        get fooGetter() {
+          return 'test';
+        },
+      };
+    });
+
+    const store = resolve(state);
+    expect(store).toHaveProperty('fooGetter');
+    expect(
+      Object.getOwnPropertyDescriptor(store, 'fooGetter')?.get,
+    ).toBeDefined();
+    expect(Reflect.get(store, 'fooGetter')).toEqual('test');
+  });
+
   it('will throw exception when dependency is missing', () => {
     const plugin1 = makePlugin(() => ({}), {
       name: 'plugin1',

diff --git a/packages/state/vite/babel/astAutoNaming.ts b/packages/state/vite/babel/astAutoNaming.ts
@@ -4,9 +4,10 @@ export interface BabelAstAddAutoNamingOptions {
   filterStores: (callee: string) => boolean;
 }
 
-export function babelAstAddAutoNaming({
-  filterStores,
-}: BabelAstAddAutoNamingOptions): babel.PluginObj<any> {
+export function babelAstAddAutoNaming(
+  _: unknown,
+  { filterStores }: BabelAstAddAutoNamingOptions,
+): babel.PluginObj<any> {
   return {
     name: 'statebuilder:stateprovider-addAutoName',
     visitor: {

diff --git a/packages/state/vitest.config.ts b/packages/state/vitest.config.ts
@@ -14,5 +14,14 @@ export default defineConfig({
     // threads: false,
     // isolate: false,
   },
-  plugins: [solidPlugin(), tsconfigPaths()],
+  plugins: [
+    solidPlugin(),
+    tsconfigPaths(),
+    statebuilder({
+      autoKey: false,
+      experimental: {
+        transformStateProviderDirective: true,
+      },
+    }),
+  ],
 });