wip: fixture triage for canonical spelling

Author: claude

packages/rest/src/public-form-lookup-picker.test.ts

@@ -203,16 +203,27 @@ describe('#7467 a spec-valid stored form carrying a publicPicker reaches the loo
         // the declared object override, the declared cap, the declared filter
         // rows ahead of the visitor's search predicate, id + displayFields
         // projection, offset pinned to 0 (no anonymous pagination).
+        //
+        // [#16337] The KEYS are the canonical QueryAST ones (`where` / `fields`
+        // / `orderBy`); until then the route spelled them `filters` / `select` /
+        // `sort`, wire aliases the normalizer folds onto exactly these. The
+        // VALUES are byte-identical across that rewrite, which is the point —
+        // and note what `where` carries: `ViewFilterRule` rows, the dialect
+        // `FormFieldPublicPickerSchema.filter` declares, NOT a
+        // `FilterCondition`. `findData` is stubbed in this suite, so it never
+        // meets the ingress's verdict on that value; the real normalizer
+        // refuses it. Filed separately — ⛔ do not "repair" it by editing this
+        // expectation.
         expect(findData).toHaveBeenCalledTimes(1);
         const call = findData.mock.calls[0][0];
         expect(call.object).toBe('sys_user');
         expect(call.query.limit).toBe(10);
         expect(call.query.offset).toBe(0);
-        expect(call.query.select).toEqual(['id', 'name', 'email']);
+        expect(call.query.fields).toEqual(['id', 'name', 'email']);
         // [#7485] Ordering is fixed, not authorable: first display field,
         // ascending. The route's `picker.sort ??` read is retired.
-        expect(call.query.sort).toEqual([{ field: 'name', order: 'asc' }]);
-        expect(call.query.filters).toEqual([
+        expect(call.query.orderBy).toEqual([{ field: 'name', order: 'asc' }]);
+        expect(call.query.where).toEqual([
             { field: 'is_active', operator: 'equals', value: true },
             { field: 'name', operator: 'contains', value: 'ad' },
         ]);
@@ -299,7 +310,7 @@ describe('#7485 publicPicker.sort is retired — not declarable, and not read',
         // The stored `{ field: 'email', order: 'desc' }` reaches `findData`
         // nowhere: the fixed default is the only ordering the route composes.
         expect(findData).toHaveBeenCalledTimes(1);
-        expect(findData.mock.calls[0][0].query.sort).toEqual([{ field: 'name', order: 'asc' }]);
+        expect(findData.mock.calls[0][0].query.orderBy).toEqual([{ field: 'name', order: 'asc' }]);
     });
 
     it('…and the fixed sort tracks displayFields[0], including the no-displayFields default', async () => {
@@ -310,15 +321,15 @@ describe('#7485 publicPicker.sort is retired — not declarable, and not read',
         const stored = await persistedBody(studioForm([{ field: 'owner', publicPicker: { object: 'sys_user' } }]));
         const { findData, lookup } = routesOver(stored, []);
         await lookup.handler({ params: { slug: 'contact', field: 'owner' }, query: {} } as any, mockRes());
-        expect(findData.mock.calls[0][0].query.sort).toEqual([{ field: 'name', order: 'asc' }]);
+        expect(findData.mock.calls[0][0].query.orderBy).toEqual([{ field: 'name', order: 'asc' }]);
 
         const stored2 = await persistedBody(studioForm([{
             field: 'owner',
             publicPicker: { displayFields: ['email', 'name'], object: 'sys_user' },
         }]));
         const second = routesOver(stored2, []);
         await second.lookup.handler({ params: { slug: 'contact', field: 'owner' }, query: {} } as any, mockRes());
-        expect(second.findData.mock.calls[0][0].query.sort).toEqual([{ field: 'email', order: 'asc' }]);
+        expect(second.findData.mock.calls[0][0].query.orderBy).toEqual([{ field: 'email', order: 'asc' }]);
     });
 });
 

packages/rest/src/rest-server-canonical-query-ast.test.ts

@@ -132,8 +132,10 @@ describe('[#16337] §1 no server-built `query` slot in rest-server.ts is erased
         ).toEqual([]);
     });
 
-    it('no `query` slot carries an `as` cast', () => {
-        const cast = querySlots().filter(({ line }) => /\bas\s+(any|unknown|FindDataRequest)\b/.test(slotBody(line)));
+    it('no server-built `query` literal carries an `as` cast', () => {
+        const cast = querySlots()
+            .filter(({ text }) => text.trim() !== CALLER_SUPPLIED_SLOT)
+            .filter(({ line }) => /\bas\s+(any|unknown|FindDataRequest)\b/.test(slotBody(line)));
         expect(cast.map((c) => `line ${c.line}`)).toEqual([]);
     });
 

packages/rest/src/rest-server-closed-query-params.test.ts

@@ -303,18 +303,20 @@ describe('#7606 §2 — GET /data/:object/export', () => {
         // is what makes this a preservation pin: `limit` silently dropped
         // exports the whole table with a perfectly ordinary 200.
 
-        // `limit` is the binding cap here (25 < 100), so $top proves IT arrived.
+        // `limit` is the binding cap here (25 < 100), so the query's `limit`
+        // proves IT arrived. (Spelled `$top` until #16337 canonicalised the
+        // door's literal; the assertion is unchanged in what it measures.)
         const capped = boot();
         const byLimit = await capped.exportRows({ format: 'csv', limit: '25', page: '100' });
         expect(byLimit.status).toBe(200);
-        expect((capped.findData.mock.calls[0][0] as any)?.query?.$top).toBe(25);
+        expect((capped.findData.mock.calls[0][0] as any)?.query?.limit).toBe(25);
 
-        // `page` is the binding cap here (50 < 200), so $top proves IT arrived
-        // — a default chunk would have read 500.
+        // `page` is the binding cap here (50 < 200), so the query's `limit`
+        // proves IT arrived — a default chunk would have read 500.
         const chunked = boot();
         const byPage = await chunked.exportRows({ format: 'csv', limit: '200', page: '50' });
         expect(byPage.status).toBe(200);
-        expect((chunked.findData.mock.calls[0][0] as any)?.query?.$top).toBe(50);
+        expect((chunked.findData.mock.calls[0][0] as any)?.query?.limit).toBe(50);
     });
 
     it('PRESERVATION: the row-selection axes still narrow the export', async () => {

packages/rest/src/rest.test.ts

@@ -1119,8 +1119,8 @@ describe('RestServer', () => {
 
       // Always return full chunks so the loop is bounded only by `limit`.
       protocol.findData.mockImplementation(async ({ query }: any) => {
-        const take = query?.$top ?? 0;
-        return { data: Array.from({ length: take }, (_v, i) => ({ id: String((query?.$skip ?? 0) + i) })) };
+        const take = query?.limit ?? 0;
+        return { data: Array.from({ length: take }, (_v, i) => ({ id: String((query?.offset ?? 0) + i) })) };
       });
 
       const { res, chunks } = makeRes();
@@ -1214,7 +1214,7 @@ describe('RestServer', () => {
       expect(lines[0]).toBe('1,写代码,是,高,2026-06-30,张三');
     });
 
-    it('injects $expand for reference fields into the findData query', async () => {
+    it('injects expand for reference fields into the findData query', async () => {
       const p = protocolWithSchema([RAW_TASK_ROW]);
       const rest = new RestServer(server as any, p as any, ANON_API as any);
       (rest as any).resolveExecCtx = async () => ({ userId: 'test-user' });
@@ -1226,7 +1226,11 @@ describe('RestServer', () => {
 
       expect(p.findData).toHaveBeenCalled();
       const firstQuery = p.findData.mock.calls[0][0].query;
-      expect(firstQuery.$expand).toBe('owner');
+      // [#16337] The door builds the canonical relation MAP the QueryAST
+      // declares. It used to build the comma list `$expand` accepted, which
+      // the normalizer lowered to exactly this map — same value, one fewer
+      // dialect between the door and the engine.
+      expect(firstQuery.expand).toEqual({ owner: { object: 'owner' } });
     });
 
     it('formats values readably in JSON, leaving unknown keys untouched', async () => {
@@ -1326,7 +1330,7 @@ describe('RestServer', () => {
       p.getMetaItem = vi.fn().mockResolvedValue({ type: 'object', name: 'task', item: NAMED_SCHEMA });
       // First page returns one row, subsequent pages are empty (ends the stream).
       p.findData = vi.fn(async ({ query }: any) =>
-        (query?.$skip ?? 0) === 0 ? { data: [{ id: '1', title: 'x', done: true }] } : { data: [] },
+        (query?.offset ?? 0) === 0 ? { data: [{ id: '1', title: 'x', done: true }] } : { data: [] },
       );
 
       // i18nServiceProvider is the 14th constructor arg (after server, protocol,