@prestack/thread-ui 0.1.8 → 0.1.10

package/dist/ui/generators/routes.ts

@@ -3,12 +3,13 @@ import { argv, stderr, stdout } from 'node:process'
 
 import ts from 'typescript'
 
-import { existsSync, readFileSync, realpathSync, writeFileSync } from '@prestack/thread/integrations/disk'
+import { existsSync, readFileSync, readdirSync, realpathSync, rmSync, writeFileSync } from '@prestack/thread/integrations/disk'
 import { exit, invoked } from '@prestack/thread/core/invoked'
-import { valuesIn } from '@prestack/thread/core/rows'
+import { listBounds, nestedBounds, rowsIn, valuesIn, withField, withRow, withoutField, withoutRow } from '@prestack/thread/core/rows'
 import { named as packageOf } from '@prestack/thread/core/scope'
 import { findTree, inTree } from '@prestack/thread/core/tree'
 import { PERMITS_AT } from '@prestack/thread/operations/access'
+import { said } from '@prestack/thread/operations/attach'
 import { ACTOR_AT, COMPILED } from '@prestack/thread/operations/capabilities'
 
 import { compiledAt, nameOf as compositionOf } from '../compositions.ts'
@@ -36,6 +37,15 @@ const GRAMMAR = `${COMPILED}/ui/islands/map.ts`
 
 const MOVES = 'navigateTo'
 
+const PAGE_ROW = 'page'
+
+const WRITER = 'thread routes'
+
+const PAGE_SAID =
+  'The page a browser gets at the address of this screen: `/` when it is the first page this app declares, and its own ' +
+  'name otherwise. `thread routes` writes the page and this row from where the screen sits, and moves or deletes both ' +
+  'when that changes.'
+
 function served(at: string): boolean {
   try {
     const held = JSON.parse(readFileSync(join(at, 'package.json'), 'utf8')) as {
@@ -386,6 +396,51 @@ function page(name: string, at: string, route: string): string {
   ].join('\n')
 }
 
+interface Repaged {
+  readonly id: string
+  readonly shown: string
+  readonly route: string | undefined
+  readonly was: string | undefined
+  readonly where: string | undefined
+}
+
+const pageShaped = (path: string): boolean => path === pageAt(`/${path.split('/').slice(1, -1).join('/')}`)
+
+function unpaged(one: Repaged): string {
+  if (one.where === undefined) {
+    return (
+      `\`${one.id}\` is presented as a ${one.shown}, so it has no page, and its row still derives ${String(one.was)}. ` +
+      `Run \`${WRITER}\`, which takes that row out and deletes the page.`
+    )
+  }
+  return (
+    `\`${one.id}\` answers ${String(one.route)}, so its page is ${one.where}, and its row ` +
+    `${one.was === undefined ? 'derives no page' : `says ${one.was}`}. Run \`${WRITER}\`, which writes that row from ` +
+    'where the screen now sits and puts the page there.'
+  )
+}
+
+function repaged(text: string, moved: readonly Repaged[]): string | undefined {
+  let next = text
+  for (const one of moved) {
+    const list = listBounds(next, 'declares')
+    const inside = list === undefined ? undefined : nestedBounds(next, list, one.id, 'derives')
+    if (inside !== undefined) next = withoutRow(next, inside, PAGE_ROW)
+    const rows = listBounds(next, 'declares')
+    if (rows === undefined) return undefined
+    const within = nestedBounds(next, rows, one.id, 'derives')
+    if (one.where === undefined) {
+      if (within !== undefined && rowsIn(next, within).length === 0) next = withoutField(next, rows, one.id, 'derives')
+      continue
+    }
+    const row = said({ id: PAGE_ROW, at: one.where, describes: PAGE_SAID, version: 1, by: WRITER, runs: `${WRITER} --check` }, '        ')
+    const put = within === undefined ? withField(next, rows, one.id, 'derives', `[\n${row}\n      ]`) : withRow(next, within, row)
+    if (put === undefined) return undefined
+    next = put
+  }
+  return next
+}
+
 function gate(typed: boolean): readonly string[] {
   const said = typed ? ' as { of?: Record<string, string> }' : ''
   return [
@@ -647,6 +702,7 @@ async function run(): Promise<number> {
   const entry = entryAmong(rows, shownOf)
 
   const made: { readonly path: string; readonly text: string }[] = []
+  const moved: Repaged[] = []
   const routes = new Map<string, string | undefined>()
   const screens: MapIsland['screens'][number][] = []
   const reaches = reachable(at)
@@ -658,7 +714,7 @@ async function run(): Promise<number> {
       stderr.write(
         `routes: ${row.at} states \`route: '${typed}'\`, and a route is never typed: the first page an app declares ` +
           'answers `/`, every other page answers its own name, and a sheet has no route. Take `route:` out of the ' +
-          'file — `thread create screen edit` rewrites it without one when it is given the body.\n',
+          `file with \`thread edit ${row.at} --find <text> --replace <text>\`, which changes that one stretch of it.\n`,
       )
       return 1
     }
@@ -700,20 +756,18 @@ async function run(): Promise<number> {
       entry: row.id === entry,
       shows: [...shows],
     })
-    if (route === undefined) continue
-    const where = pageAt(route)
-    const stated = (row.derives ?? []).find((one) => one.id === 'page')?.at
-    if (stated !== where) {
-      stderr.write(
-        `routes: \`${row.id}\` answers ${route}, so its page is ${where}, and its row ` +
-          `${stated === undefined ? 'derives no page' : `says ${stated}`}. Run \`thread create screen edit\` on it — ` +
-          'the row is rewritten from where the screen now lives.\n',
-      )
-      return 1
-    }
+    const where = route === undefined ? undefined : pageAt(route)
+    const was = (row.derives ?? []).find((one) => one.id === PAGE_ROW)?.at
+    if (was !== where) moved.push({ id: row.id, shown: shownAs, route, was, where })
+    if (route === undefined || where === undefined) continue
     made.push({ path: where, text: page(name, row.at, route) })
   }
 
+  if (moved.length > 0 && argv.includes('--check')) {
+    for (const one of moved) stderr.write(`routes: ${unpaged(one)}\n`)
+    return 1
+  }
+
   const { links, wrong } = linksOf(at, rows, compositions, routes, wordingFirst(keyProps(at)))
   if (wrong.length > 0) {
     for (const one of wrong) stderr.write(`routes: ${one}\n`)
@@ -749,6 +803,33 @@ async function run(): Promise<number> {
   const paged = map.screens.filter((one) => one.path !== undefined).length
   const counted = `${String(map.screens.length)} screen(s), ${String(paged)} route(s), ${String(map.links.length)} link(s)`
 
+  if (moved.length > 0) {
+    const declaredIn = relative(at, screensAt)
+    const rewritten = repaged(readFileSync(screensAt, 'utf8'), moved)
+    if (rewritten === undefined) {
+      stderr.write(
+        `routes: ${declaredIn} could not be given the page row of each screen, so nothing was written. ` +
+          `\`thread read ${declaredIn}\` prints what it states now.\n`,
+      )
+      return 1
+    }
+    writeFileSync(screensAt, rewritten, 'utf8')
+    const answered = new Set(made.map((one) => one.path))
+    const home = dirname(join(at, pageAt('/')))
+    for (const one of moved) {
+      stdout.write(
+        one.where === undefined
+          ? `routes: \`${one.id}\` has no route, so its row no longer derives ${String(one.was)}\n`
+          : `routes: \`${one.id}\` answers ${String(one.route)}, so its row now derives ${one.where}\n`,
+      )
+      if (one.was === undefined || answered.has(one.was) || !pageShaped(one.was) || !existsSync(join(at, one.was))) continue
+      rmSync(join(at, one.was))
+      const folder = dirname(join(at, one.was))
+      if (folder !== home && readdirSync(folder).length === 0) rmSync(folder, { recursive: true, force: true })
+      stdout.write(`routes: deleted ${one.was}, because no screen answers there any more\n`)
+    }
+  }
+
   const refused = landed(at, made)
   if (refused !== undefined) return refused
 

package/dist/ui/variant.d.ts

@@ -1,5 +1,4 @@
 import { FREE, type Material, type Setting } from './material.ts';
-import type { MATERIALS } from './materials.ts';
 import type { Holds, Token, Wearing } from './token.ts';
 import { holds } from './signals.ts';
 interface Stateful {
@@ -10,7 +9,6 @@ interface Stateful {
     }[];
 }
 type SignalId = (typeof holds)[number]['id'] | (string & {});
-type MaterialId = (typeof MATERIALS)['declares'][number]['id'] | (string & {});
 declare const BOUND: {
     readonly background: readonly ['colour', 'gradient', 'texture', 'noise', 'img'];
     readonly borderColor: readonly ['colour'];
@@ -69,7 +67,7 @@ type VariantSetting = {
 export interface Variant {
     readonly id: string;
     readonly version?: number;
-    readonly material?: MaterialId;
+    readonly material?: string;
     readonly type?: string;
     readonly icon?: string;
     readonly sets: readonly VariantSetting[];

package/dist/ui/variant.ts

@@ -1,5 +1,4 @@
 import { BOUND as MATERIAL_BOUND, compose, composed, FREE, type Material, type Setting } from './material.ts'
-import type { MATERIALS } from './materials.ts'
 import type { Holds, Token, Wearing } from './token.ts'
 import { coexist, holds, isSignal, selectorOf, signalNames } from './signals.ts'
 
@@ -14,8 +13,6 @@ interface Stateful {
 
 type SignalId = (typeof holds)[number]['id'] | (string & {})
 
-type MaterialId = (typeof MATERIALS)['declares'][number]['id'] | (string & {})
-
 const BOUND = {
   background: ['colour', 'gradient', 'texture', 'noise', 'img'],
   borderColor: ['colour'],
@@ -87,7 +84,7 @@ export interface Variant {
 
   readonly version?: number
 
-  readonly material?: MaterialId
+  readonly material?: string
 
   readonly type?: string
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prestack/thread-ui",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "type": "module",
   "files": [
     "dist",
@@ -17,6 +17,6 @@
     "react-dom": "^19.0.0",
     "typescript": "^6.0.0",
     "zod": "^4.5.4",
-    "@prestack/thread": "^0.1.19"
+    "@prestack/thread": "^0.1.21"
   }
 }