@object-ui/data-objectstack 3.1.1 → 3.1.3

package/dist/index.cjs

@@ -887,7 +887,7 @@ var ObjectStackAdapter = class {
       try {
         const findParams = {
           ...params,
-          $filter: { _id: String(id) },
+          $filter: { id: String(id) },
           $top: 1
         };
         const result = await this.rawFindWithPopulate(resource, findParams);
@@ -901,7 +901,6 @@ var ObjectStackAdapter = class {
         if (error?.status === 404) {
           return null;
         }
-        throw error;
       }
     }
     try {

package/dist/index.js

@@ -847,7 +847,7 @@ var ObjectStackAdapter = class {
       try {
         const findParams = {
           ...params,
-          $filter: { _id: String(id) },
+          $filter: { id: String(id) },
           $top: 1
         };
         const result = await this.rawFindWithPopulate(resource, findParams);
@@ -861,7 +861,6 @@ var ObjectStackAdapter = class {
         if (error?.status === 404) {
           return null;
         }
-        throw error;
       }
     }
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@object-ui/data-objectstack",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "ObjectStack Data Adapter for Object UI",
   "license": "MIT",
   "type": "module",
@@ -20,9 +20,9 @@
     "README.md"
   ],
   "dependencies": {
-    "@objectstack/client": "^3.2.1",
-    "@object-ui/core": "3.1.1",
-    "@object-ui/types": "3.1.1"
+    "@objectstack/client": "^3.2.6",
+    "@object-ui/core": "3.1.3",
+    "@object-ui/types": "3.1.3"
   },
   "devDependencies": {
     "tsup": "^8.5.1",

package/src/expand.test.ts

@@ -16,7 +16,7 @@ import { ObjectStackAdapter } from './index';
 // The key scenarios:
 //   1. find() with $expand → raw GET /api/v1/data/:object?populate=...
 //   2. find() without $expand → client.data.find() (GET) as before
-//   3. findOne() with $expand → raw GET /api/v1/data/:object?filter={_id:...}&populate=...
+//   3. findOne() with $expand → raw GET /api/v1/data/:object?filter={id:...}&populate=...
 //   4. findOne() without $expand → client.data.get() as before
 
 describe('ObjectStackAdapter $expand support', () => {
@@ -42,7 +42,7 @@ describe('ObjectStackAdapter $expand support', () => {
       data: {
         find: vi.fn().mockResolvedValue({ records: [], total: 0 }),
         query: vi.fn().mockResolvedValue({ records: [], total: 0 }),
-        get: vi.fn().mockResolvedValue({ record: { _id: '1', name: 'Test' } }),
+        get: vi.fn().mockResolvedValue({ record: { id: '1', name: 'Test' } }),
       },
       connect: vi.fn().mockResolvedValue(undefined),
       discover: vi.fn().mockResolvedValue({ status: 'ok' }),
@@ -58,7 +58,7 @@ describe('ObjectStackAdapter $expand support', () => {
       mockFetch.mockResolvedValue({
         ok: true,
         json: () => Promise.resolve({
-          records: [{ _id: '1', name: 'Order 1', customer: { _id: '2', name: 'Alice' } }],
+          records: [{ id: '1', name: 'Order 1', customer: { id: '2', name: 'Alice' } }],
           total: 1,
         }),
       });
@@ -76,7 +76,7 @@ describe('ObjectStackAdapter $expand support', () => {
       expect(fetchUrl).toContain('top=10');
       expect(mockClient.data.find).not.toHaveBeenCalled();
       expect(result.data).toHaveLength(1);
-      expect(result.data[0].customer).toEqual({ _id: '2', name: 'Alice' });
+      expect(result.data[0].customer).toEqual({ id: '2', name: 'Alice' });
     });
 
     it('should pass filters and sort as query params', async () => {
@@ -103,7 +103,7 @@ describe('ObjectStackAdapter $expand support', () => {
     });
 
     it('should use data.find() when $expand is not present', async () => {
-      mockClient.data.find.mockResolvedValue({ records: [{ _id: '1', name: 'Test' }], total: 1 });
+      mockClient.data.find.mockResolvedValue({ records: [{ id: '1', name: 'Test' }], total: 1 });
 
       const result = await adapter.find('order', { $top: 10 });
 
@@ -121,11 +121,11 @@ describe('ObjectStackAdapter $expand support', () => {
   });
 
   describe('findOne() with $expand', () => {
-    it('should make a raw GET request with _id filter and populate when $expand is present', async () => {
+    it('should make a raw GET request with id filter and populate when $expand is present', async () => {
       mockFetch.mockResolvedValue({
         ok: true,
         json: () => Promise.resolve({
-          records: [{ _id: 'order-1', name: 'Order 1', customer: { _id: '2', name: 'Alice' } }],
+          records: [{ id: 'order-1', name: 'Order 1', customer: { id: '2', name: 'Alice' } }],
         }),
       });
 
@@ -139,13 +139,13 @@ describe('ObjectStackAdapter $expand support', () => {
       expect(fetchUrl).toContain('populate=customer%2Caccount');
       expect(fetchUrl).toContain('top=1');
       expect(fetchUrl).toContain('filter=');
-      // Verify the filter contains _id
+      // Verify the filter contains id
       const filterParam = new URL(fetchUrl).searchParams.get('filter');
       expect(filterParam).toBeTruthy();
       const parsedFilter = JSON.parse(filterParam!);
-      expect(parsedFilter).toEqual({ _id: 'order-1' });
+      expect(parsedFilter).toEqual({ id: 'order-1' });
       expect(mockClient.data.get).not.toHaveBeenCalled();
-      expect(result).toEqual({ _id: 'order-1', name: 'Order 1', customer: { _id: '2', name: 'Alice' } });
+      expect(result).toEqual({ id: 'order-1', name: 'Order 1', customer: { id: '2', name: 'Alice' } });
     });
 
     it('should return null when raw request returns no records', async () => {
@@ -162,12 +162,12 @@ describe('ObjectStackAdapter $expand support', () => {
     });
 
     it('should use data.get() when $expand is not present', async () => {
-      mockClient.data.get.mockResolvedValue({ record: { _id: '1', name: 'Test' } });
+      mockClient.data.get.mockResolvedValue({ record: { id: '1', name: 'Test' } });
 
       const result = await adapter.findOne('order', '1');
 
       expect(mockClient.data.get).toHaveBeenCalledWith('order', '1');
-      expect(result).toEqual({ _id: '1', name: 'Test' });
+      expect(result).toEqual({ id: '1', name: 'Test' });
     });
 
     it('should return null for 404 errors without $expand', async () => {
@@ -177,6 +177,28 @@ describe('ObjectStackAdapter $expand support', () => {
 
       expect(result).toBeNull();
     });
+
+    it('should fall through to data.get() when $expand raw request fails with non-404 error', async () => {
+      // The raw populate request fails (e.g., server doesn't support the filter+populate API)
+      mockFetch.mockResolvedValue({
+        ok: false,
+        status: 500,
+        statusText: 'Internal Server Error',
+        json: () => Promise.resolve({ message: 'unsupported' }),
+      });
+      // But the direct data.get() call succeeds
+      mockClient.data.get.mockResolvedValue({ record: { id: 'order-1', name: 'Order 1' } });
+
+      const result = await adapter.findOne('order', 'order-1', {
+        $expand: ['customer'],
+      });
+
+      // Should have tried raw request first
+      expect(mockFetch).toHaveBeenCalled();
+      // Then fell through to data.get()
+      expect(mockClient.data.get).toHaveBeenCalledWith('order', 'order-1');
+      expect(result).toEqual({ id: 'order-1', name: 'Order 1' });
+    });
   });
 
   describe('raw request format', () => {
@@ -203,7 +225,7 @@ describe('ObjectStackAdapter $expand support', () => {
         json: () => Promise.resolve({
           success: true,
           data: {
-            records: [{ _id: '1', name: 'Order' }],
+            records: [{ id: '1', name: 'Order' }],
             total: 1,
           },
         }),

package/src/index.ts

@@ -278,14 +278,14 @@ export class ObjectStackAdapter<T = unknown> implements DataSource<T> {
   async findOne(resource: string, id: string | number, params?: QueryParams): Promise<T | null> {
     await this.connect();
 
-    // When $expand is requested, use a raw GET request with a filter by _id
+    // When $expand is requested, use a raw GET request with a filter by id
     // and populate. The installed server v3.0.10's getData() does not support
     // expand/populate, so we route through findData which does.
     if (params?.$expand && params.$expand.length > 0) {
       try {
         const findParams: QueryParams = {
           ...params,
-          $filter: { _id: String(id) },
+          $filter: { id: String(id) },
           $top: 1,
         };
         const result = await this.rawFindWithPopulate(resource, findParams);
@@ -300,7 +300,9 @@ export class ObjectStackAdapter<T = unknown> implements DataSource<T> {
         if ((error as Record<string, unknown>)?.status === 404) {
           return null;
         }
-        throw error;
+        // Fall through to direct GET without $expand — some servers don't
+        // support the filter+populate API, so gracefully degrade to a
+        // simple data.get() call below rather than failing with "Record not found".
       }
     }