@things-factory/ai-assistant 10.1.179 → 10.1.183

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/ai-assistant",
-  "version": "10.1.179",
+  "version": "10.1.183",
   "main": "dist-server/index.js",
   "things-factory": true,
   "author": "heartyoh",
@@ -27,20 +27,20 @@
   "dependencies": {
     "@apollo/client": "^3.13.0",
     "@material/web": "^2.0.0",
-    "@operato/graphql": "^10.0.0",
+    "@operato/graphql": "^10.29.39",
     "@operato/i18n": "^10.0.0",
-    "@operato/input": "^10.29.37",
-    "@operato/layout": "^10.20.0",
-    "@operato/popup": "^10.16.0",
-    "@operato/shell": "^10.0.0",
+    "@operato/input": "^10.29.39",
+    "@operato/layout": "^10.29.39",
+    "@operato/popup": "^10.29.39",
+    "@operato/shell": "^10.29.39",
     "@operato/styles": "^10.0.0",
-    "@operato/utils": "^10.29.38",
-    "@things-factory/ai-client-base": "^10.1.179",
+    "@operato/utils": "^10.29.39",
+    "@things-factory/ai-client-base": "^10.1.183",
     "@things-factory/apptool-base": "^10.1.179",
-    "@things-factory/attachment-base": "^10.1.179",
-    "@things-factory/auth-base": "^10.1.179",
+    "@things-factory/attachment-base": "^10.1.183",
+    "@things-factory/auth-base": "^10.1.183",
     "@things-factory/env": "^10.1.149",
-    "@things-factory/setting-base": "^10.1.179",
+    "@things-factory/setting-base": "^10.1.183",
     "@things-factory/shell": "^10.1.179",
     "dompurify": "^3.0.0",
     "exceljs": "4.2.0",
@@ -55,5 +55,5 @@
     "copyfiles": "^2.4.1",
     "rimraf": "^5.0.0"
   },
-  "gitHead": "4c8263b08e06b2b15f11dc0575c61a280a0d9e27"
+  "gitHead": "c36684e0db8353f5f4523ed55111df3154bae19e"
 }

package/server/service/data-read/data-read.test.ts

@@ -58,7 +58,7 @@ beforeEach(() => {
 })
 
 describe('reading a list', () => {
-  it('★ the conditions become the application\'s filters - the model never names the query\'s columns', async () => {
+  it("★ the conditions become the application's filters - the model never names the query's columns", async () => {
     const result: any = await queryRecords(target, { from: '2026-04-01', to: '2026-09-30', flow: 'EXPENSE' }, {}, run)
     expect(calls[0].filters).toEqual([
       { name: 'transactionDate', operator: 'gte', value: '2026-04-01' },
@@ -124,7 +124,7 @@ describe('the screen card', () => {
 })
 
 describe('declaring and offering', () => {
-  it('★ the tools are locked by the list query\'s door, and a mode opens them by key', () => {
+  it("★ the tools are locked by the list query's door, and a mode opens them by key", () => {
     const category = readCategoryOf(target, () => run)
     expect(category.name).toBe(readCategoryName(target.key))
     expect(category.specs.map(spec => spec.name)).toEqual([queryToolName(target.key), screenToolName(target.key)])
@@ -196,7 +196,7 @@ describe('a list declared in one line', () => {
     narrowing: { year: 'year', month: 'month', flow: 'type' },
     search: 'memo and counterparty',
     route: 'cash-transaction-list',
-    screenTakes: ['year', 'month', 'flow', 'text']
+    screenQuery: true
   }
 
   it('★ becomes a target with the conditions its fields allow - and only those', async () => {
@@ -207,22 +207,44 @@ describe('a list declared in one line', () => {
     const bare: ReadTarget = listReadTarget({ ...line, key: 'office.bare', narrowing: undefined, dateField: undefined, search: undefined, columns: [{ name: 'name', type: 'string' }] })
     expect(bare.criteria).toEqual([])
     expect(bare.query).not.toContain('$search')
-    expect(bare.screen!.takes).toEqual([])
+    expect(bare.screen!.takes).toEqual(['id'])
   })
 
-  it('★ the to day takes the whole day of a date-time, and the screen gets only what it reads', () => {
+  it('the screen uses the same predicates as a read, including ranges outside its filter form', () => {
     const made: ReadTarget = listReadTarget(line)
     const to = made.criteria.find(one => one.name === 'to')!
-    expect(to.filter('2026-09-30')).toEqual({ name: 'transactionDate', operator: 'lte', value: '2026-09-30T23:59:59.999' })
-    expect(made.screen!.params({ year: 2026, month: 9, flow: 'EXPENSE', text: '외주', from: '2026-01-01' })).toEqual({ year: 2026, month: 9, flow: 'EXPENSE', search: '외주' })
-    expect(made.screen!.params({ month: 9 })).toEqual({})
-    const plain: ReadTarget = listReadTarget({ ...line, key: 'plant.x', screenTakes: undefined })
+    expect(to.filter('2026-09-30')).toEqual({
+      name: 'transactionDate',
+      operator: 'lte',
+      value: '2026-09-30T23:59:59.999'
+    })
+    const criteria = { year: 2026, month: 9, flow: 'EXPENSE', text: '외주', from: '2026-01-01', minAmount: 100000 }
+    const address = screenAddress(made, criteria)!
+    const query = new URLSearchParams(address.href.split('?')[1])
+    expect(query.has('year')).toBe(false)
+    expect(query.has('month')).toBe(false)
+    expect(query.has('flow')).toBe(false)
+    expect(JSON.parse(query.get('filters')!)).toEqual([
+      { name: 'transactionDate', operator: 'gte', value: '2026-01-01' },
+      { name: 'year', operator: 'eq', value: 2026 },
+      { name: 'month', operator: 'eq', value: 9 },
+      { name: 'type', operator: 'eq', value: 'EXPENSE' },
+      { name: 'amount', operator: 'gte', value: 100000 }
+    ])
+    expect(query.get('search')).toBe('외주')
+    expect(address.notApplied).toEqual([])
+    const plain: ReadTarget = listReadTarget({ ...line, key: 'plant.x', screenQuery: false })
     expect(plain.screen!.takes).toEqual([])
-    expect(plain.screen!.params({ year: 2026 })).toEqual({})
+    expect(screenAddress(plain, { year: 2026 })!.notApplied).toEqual(['year'])
   })
 
-  it('★ a fixed filter is on every read, out of the model\'s reach - a condition narrows the list, never widens it', async () => {
-    const made: ReadTarget = listReadTarget({ ...line, key: 'office.spending', listQuery: 'cashTransactions', fixedFilters: [{ name: 'type', operator: 'eq', value: 'EXPENSE' }] })
+  it("★ a fixed filter is on every read, out of the model's reach - a condition narrows the list, never widens it", async () => {
+    const made: ReadTarget = listReadTarget({
+      ...line,
+      key: 'office.spending',
+      listQuery: 'cashTransactions',
+      fixedFilters: [{ name: 'type', operator: 'eq', value: 'EXPENSE' }]
+    })
     declareReadTarget(made)
     expect(made.criteria.map(one => one.name)).not.toContain('type')
     const all: any = await queryRecords(made, {}, {}, run)
@@ -246,7 +268,12 @@ describe('amounts in more than one currency', () => {
     ...target,
     key: 'office.fx-transaction',
     query: target.query.replace('customerName account', 'customerName currency account'),
-    columns: [...target.columns.map(one => (one.name === 'amount' ? { ...one, labelKey: 'field.amount', currency: 'currency' } : one)), { name: 'currency', type: 'string' }]
+    columns: [
+      ...target.columns.map(one =>
+        one.name === 'amount' ? { ...one, labelKey: 'field.amount', currency: 'currency' } : one
+      ),
+      { name: 'currency', type: 'string' }
+    ]
   }
   const fxt = (i: number, amount: number, currency: string | null, customerName: string) => ({ ...tx(i, '2026-06-01', 'INCOME', amount, customerName), currency })
 
@@ -257,7 +284,7 @@ describe('amounts in more than one currency', () => {
     expect(JSON.stringify(result.sums)).not.toMatch(/1100/)
   })
 
-  it('a line without its currency is summed as unknown, never as the domain\'s own', async () => {
+  it("a line without its currency is summed as unknown, never as the domain's own", async () => {
     ledger = [fxt(1, 1000, 'KRW', 'A'), fxt(2, 7, null, 'B')]
     const result: any = await queryRecords(fx, {}, {}, run)
     expect(result.sums.amount).toEqual({ KRW: 1000, unknown: 7 })

package/server/service/data-read/list-read.ts

@@ -31,8 +31,8 @@ export interface ListRead {
   search?: string
   /** The screen's route. Left out, the list has no screen card. */
   route?: string
-  /** The conditions the screen reads from its address - `year`, `month`, `flow` and `text` (as `search`). Empty: it opens as it is. */
-  screenTakes?: ('year' | 'month' | 'flow' | 'text')[]
+  /** The route has a URL-bound grid. Otherwise conditions are disclosed as not applied on its screen card. */
+  screenQuery?: boolean
 }
 
 /** The money column a minimum or maximum amount means - `amount` when there is one, else the first summed column. */
@@ -70,7 +70,9 @@ export function listReadTarget(list: ListRead): ReadTarget {
       : [])
   ] as ReadCriterion[]
 
-  const takes = (list.screenTakes ?? []).filter(name => (name === 'text' ? search : !!narrowing[name]))
+  const takes = list.screenQuery
+    ? ['id', ...criteria.map(criterion => criterion.name), ...(search ? ['text'] : [])]
+    : []
   return {
     key: list.key,
     labelKey: list.title,
@@ -90,12 +92,8 @@ export function listReadTarget(list: ListRead): ReadTarget {
             route: list.route,
             labelKey: list.title,
             takes,
-            params: (c: Record<string, any>) => ({
-              ...(takes.includes('year') ? { year: c.year } : {}),
-              ...(takes.includes('month') && c.year ? { month: c.month } : {}),
-              ...(takes.includes('flow') ? { flow: c.flow } : {}),
-              ...(takes.includes('text') ? { search: c.text } : {})
-            })
+            queryState: !!list.screenQuery,
+            params: () => ({})
           }
         }
       : {})

package/server/service/data-read/read-target.ts

@@ -10,6 +10,7 @@
  * Pure but for the GraphQL runner, which comes in as an argument - the rules are tested without a server.
  */
 import { readFieldValue, rootFieldOf, type EntryField } from '../data-entry/entry-target.js'
+import { encodeListQuery } from '@operato/utils/list-query.js'
 import type { GraphqlRunner } from '../data-entry/entry-update.js'
 import { parse } from 'graphql'
 
@@ -41,6 +42,8 @@ export interface ReadColumn {
 }
 
 export interface ReadScreen {
+  /** A URL-bound grid accepts the same predicates used by readRows, including conditions outside its form. */
+  queryState?: boolean
   /** The application's route of the list screen (`cash-transaction-list`). */
   route: string
   /** The conditions the screen takes, as its address's query arguments. A condition left out is said on the card. */
@@ -109,7 +112,7 @@ export function declareReadTarget(target: ReadTarget): void {
     if (!column.total || column.type !== 'number') throw new Error(`column '${column.name}' of '${target.key}' names a currency but is not a summed number`)
     if (target.columns.find(one => one.name === column.currency)?.type !== 'string') throw new Error(`column '${column.name}' of '${target.key}' takes its currency from '${column.currency}', which is no string column`)
   }
-  const names = new Set<string>()
+  const names = new Set<string>(['id'])
   for (const criterion of target.criteria) {
     if (criterion.name === 'id') throw new Error(`read target '${target.key}' declares 'id' - every target takes it`)
     if (criterion.name === 'text' && target.search) throw new Error(`read target '${target.key}' declares 'text' and search - search is the text condition`)
@@ -213,7 +216,9 @@ export function readCriteria(target: ReadTarget, args: any): { criteria: Record<
 export function filtersOf(target: ReadTarget, criteria: Record<string, unknown>): ReadFilter[] {
   return [
     ...(typeof criteria.id === 'string' ? [{ name: 'id', operator: 'eq', value: criteria.id }] : []),
-    ...target.criteria.flatMap(criterion => (criterion.name in criteria ? [criterion.filter(criteria[criterion.name])].flat() : []))
+    ...target.criteria.flatMap(criterion =>
+      criterion.name in criteria ? [criterion.filter(criteria[criterion.name])].flat() : []
+    )
   ]
 }
 
@@ -331,7 +336,14 @@ export function screenAddress(target: ReadTarget, criteria: Record<string, unkno
   const params = new URLSearchParams()
   for (const [name, value] of Object.entries(screen.params(criteria))) if (value !== undefined && value !== null && value !== '') params.set(name, String(value))
   const given = Object.keys(criteria)
-  const query = params.toString()
+  const applicable = Object.fromEntries(Object.entries(criteria).filter(([name]) => screen.takes.includes(name)))
+  const query = screen.queryState
+    ? encodeListQuery({
+        filters: filtersOf(target, applicable),
+        search: typeof applicable.text === 'string' ? applicable.text : undefined,
+        sorters: target.sortings
+      })
+    : params.toString()
   return {
     href: query ? `${screen.route}?${query}` : screen.route,
     applied: given.filter(name => screen.takes.includes(name)),