@dxos/echo-solid 0.8.4-main.ef1bc66f44 → 0.8.4-main.fcfe5033a5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/echo-solid",
-  "version": "0.8.4-main.ef1bc66f44",
+  "version": "0.8.4-main.fcfe5033a5",
   "description": "Solid.js integration for ECHO.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -30,19 +30,19 @@
   "dependencies": {
     "@effect-atom/atom": "^0.5.1",
     "@solid-primitives/utils": "^6.3.2",
-    "@dxos/echo": "0.8.4-main.ef1bc66f44",
-    "@dxos/echo-atom": "0.8.4-main.ef1bc66f44",
-    "@dxos/effect-atom-solid": "0.8.4-main.ef1bc66f44"
+    "@dxos/echo": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo-atom": "0.8.4-main.fcfe5033a5",
+    "@dxos/effect-atom-solid": "0.8.4-main.fcfe5033a5"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",
-    "solid-js": "^1.9.9",
+    "solid-js": "^1.9.11",
     "vite-plugin-solid": "^2.11.10",
     "vitest": "3.2.4",
-    "@dxos/echo-db": "0.8.4-main.ef1bc66f44"
+    "@dxos/echo-db": "0.8.4-main.fcfe5033a5"
   },
   "peerDependencies": {
-    "solid-js": "^1.9.9"
+    "solid-js": "^1.9.11"
   },
   "publishConfig": {
     "access": "public"

package/src/useObject.test.tsx

@@ -8,8 +8,8 @@ import { describe, expect, test } from 'vitest';
 
 import type { Entity } from '@dxos/echo';
 import { Obj } from '@dxos/echo';
-import { TestSchema } from '@dxos/echo/testing';
 import { createObject } from '@dxos/echo-db';
+import { TestSchema } from '@dxos/echo/testing';
 import { Registry } from '@dxos/effect-atom-solid';
 import { RegistryProvider } from '@dxos/effect-atom-solid';
 
@@ -87,8 +87,8 @@ describe('useObject', () => {
     expect(getByTestId('value').textContent).toBe('Test');
 
     // Update the property via Obj.change.
-    Obj.change(obj, (o) => {
-      o.name = 'Updated';
+    Obj.change(obj, (obj) => {
+      obj.name = 'Updated';
     });
 
     // Wait for reactivity to update.
@@ -119,8 +119,8 @@ describe('useObject', () => {
     expect(getByTestId('name').textContent).toBe('Test');
 
     // Update a property via Obj.change.
-    Obj.change(obj, (o) => {
-      o.name = 'Updated';
+    Obj.change(obj, (obj) => {
+      obj.name = 'Updated';
     });
 
     // Wait for reactivity to update.
@@ -150,8 +150,8 @@ describe('useObject', () => {
     expect(result).toBe('Test');
 
     // Update a different property via Obj.change.
-    Obj.change(obj, (o) => {
-      o.email = 'newemail@example.com';
+    Obj.change(obj, (obj) => {
+      obj.email = 'newemail@example.com';
     });
 
     // Name should still be 'Test'.

package/src/useObject.ts

@@ -160,20 +160,20 @@ export function useObject<T extends Obj.Unknown, K extends keyof T>(
       return;
     }
 
-    Obj.change(obj, (o: any) => {
+    Obj.change(obj, (obj: any) => {
       if (typeof updateOrValue === 'function') {
-        const returnValue = (updateOrValue as (obj: unknown) => unknown)(property !== undefined ? o[property] : o);
+        const returnValue = (updateOrValue as (obj: unknown) => unknown)(property !== undefined ? obj[property] : obj);
         if (returnValue !== undefined) {
           if (property === undefined) {
             throw new Error('Cannot re-assign the entire object');
           }
-          o[property] = returnValue;
+          obj[property] = returnValue;
         }
       } else {
         if (property === undefined) {
           throw new Error('Cannot re-assign the entire object');
         }
-        o[property] = updateOrValue;
+        obj[property] = updateOrValue;
       }
     });
   };

package/src/useQuery.test.tsx

@@ -7,8 +7,8 @@ import { type JSX, createSignal } from 'solid-js';
 import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 
 import { Filter, Obj, Query } from '@dxos/echo';
-import { TestSchema } from '@dxos/echo/testing';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
+import { TestSchema } from '@dxos/echo/testing';
 
 import { useQuery } from './useQuery';
 

package/src/useSchema.test.tsx

@@ -7,8 +7,8 @@ import { type JSX, createMemo } from 'solid-js';
 import { afterEach, beforeEach, describe, expect, test } from 'vitest';
 
 import { Type } from '@dxos/echo';
-import { TestSchema } from '@dxos/echo/testing';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
+import { TestSchema } from '@dxos/echo/testing';
 
 import { useSchema } from './useSchema';
 
@@ -100,7 +100,7 @@ describe('useSchema', () => {
     // The runtime registry query subscription doesn't fire when schemas are registered.
     // See: packages/core/echo/echo-db/src/proxy-db/runtime-schema-registry.ts:57
     let schemaAccessor: (() => any) | undefined;
-    const typename = 'example.com/type/Person';
+    const typename = 'com.example.type.person';
 
     function TestComponent() {
       const schema = useSchema(db, typename);

package/src/useSchema.ts

@@ -16,7 +16,7 @@ type MaybeAccessor<T> = T | Accessor<T>;
  * @param typename - The schema typename to query (can be reactive)
  * @returns An accessor that returns the current schema or undefined
  */
-export const useSchema = <T extends Type.Entity.Any = Type.Entity.Any>(
+export const useSchema = <T extends Type.AnyEntity = Type.AnyEntity>(
   db?: MaybeAccessor<Database.Database | undefined>,
   typename?: MaybeAccessor<string | undefined>,
 ): Accessor<T | undefined> => {