@prestack/thread-ui 0.1.8 → 0.1.10

package/dist/ui/compositions.js

@@ -1,10 +1,11 @@
 import { existsSync, readFileSync, readdirSync, rmSync, writeFileSync } from '@prestack/thread/integrations/disk';
 import { basename, dirname, join, relative } from 'node:path';
 import { argv, stdout } from 'node:process';
+import ts from 'typescript';
 import { SHAPED } from '@prestack/thread/core/init';
 import { exit, invoked } from '@prestack/thread/core/invoked';
 import { quoted, valuesIn } from '@prestack/thread/core/rows';
-import { named as packageOf } from '@prestack/thread/core/scope';
+import { THING, named as packageOf } from '@prestack/thread/core/scope';
 import { findTree, inTree } from '@prestack/thread/core/tree';
 import { COMPILED } from '@prestack/thread/operations/capabilities';
 import { compiled } from './generators/react.js';
@@ -156,7 +157,21 @@ export function settled(root, rows, checking, by, kept) {
     return said;
 }
 const ORG = packageOf('ui').split('/')[0] ?? '';
-const REACHED = /^(?:import|export)\s+(type\s+)?(?:(?:[^\n]|\n(?=[ \t}]))*?\s)?from\s*['"]([^'"]+)['"]/gm;
+const CORE = packageOf('core');
+const FROM_CORE = `${COMPILED}/${THING}/`;
+export function reachedIn(at, text) {
+    const file = ts.createSourceFile(at, text, ts.ScriptTarget.Latest, false, at.endsWith('.tsx') ? ts.ScriptKind.TSX : ts.ScriptKind.TS);
+    const found = [];
+    for (const one of file.statements) {
+        if (!ts.isImportDeclaration(one) && !ts.isExportDeclaration(one))
+            continue;
+        const said = one.moduleSpecifier;
+        if (said === undefined || !ts.isStringLiteral(said))
+            continue;
+        found.push({ from: said.text, typed: ts.isImportDeclaration(one) ? one.importClause?.isTypeOnly === true : one.isTypeOnly });
+    }
+    return found;
+}
 export const RUNTIME = ['wrappers.tsx', 'drag.ts', 'provider.tsx', 'islands/map.ts'];
 const NODE = /^node:/;
 function installs(root) {
@@ -182,6 +197,31 @@ export function emitting(root, entries, checking, kept) {
         ];
     }
     const seen = new Set();
+    const core = join(root, 'node_modules', CORE, 'dist');
+    const copied = (path) => {
+        const file = join(core, `${path}.ts`);
+        if (!existsSync(file))
+            return undefined;
+        const text = readFileSync(file, 'utf8');
+        if (reachedIn(path, text).length > 0)
+            return undefined;
+        const where = `${FROM_CORE}${path}.ts`;
+        if (seen.has(where))
+            return where;
+        seen.add(where);
+        kept.add(where);
+        const to = join(root, where);
+        if (checking) {
+            if (!existsSync(to) || readFileSync(to, 'utf8') !== text) {
+                said.push(`${where} is not what this app emits from ${CORE}. An emitted file that differs from its source is a hand ` +
+                    'edit wearing a generated name. Run `thread compositions` and commit what it writes.');
+            }
+        }
+        else {
+            writeFileSync(to, text, 'utf8');
+        }
+        return where;
+    };
     const walk = (at) => {
         if (seen.has(at))
             return;
@@ -194,19 +234,9 @@ export function emitting(root, entries, checking, kept) {
         }
         const text = readFileSync(file, 'utf8');
         const where = `${COMPILED}/ui/${at}`;
-        kept.add(where);
-        const to = join(root, where);
-        if (checking) {
-            if (!existsSync(to) || readFileSync(to, 'utf8') !== text) {
-                said.push(`${where} is not what this app emits from ${packageOf('ui')}. An emitted file that differs from ` +
-                    'its source is a hand edit wearing a generated name. Run `thread compositions` and commit what it writes.');
-            }
-        }
-        else {
-            writeFileSync(to, text, 'utf8');
-        }
-        for (const one of text.matchAll(REACHED)) {
-            const named = one[2] ?? '';
+        let shipped = text;
+        for (const one of reachedIn(at, text)) {
+            const named = one.from;
             if (named.startsWith('.')) {
                 const next = slashed(join(dirname(at), named));
                 if (next.startsWith('..')) {
@@ -216,7 +246,7 @@ export function emitting(root, entries, checking, kept) {
                 walk(next);
                 continue;
             }
-            if (one[1] !== undefined)
+            if (one.typed)
                 continue;
             if (!named.startsWith(`${ORG}/`)) {
                 const held = packaging(named);
@@ -227,9 +257,27 @@ export function emitting(root, entries, checking, kept) {
                     `thread attach ${packageOf('ui')} runs.`);
                 continue;
             }
+            const copy = named.startsWith(`${CORE}/`) ? copied(named.slice(CORE.length + 1)) : undefined;
+            if (copy !== undefined) {
+                const near = slashed(relative(dirname(where), copy));
+                const pointed = near.startsWith('.') ? near : `./${near}`;
+                shipped = shipped.split(`'${named}'`).join(`'${pointed}'`).split(`"${named}"`).join(`"${pointed}"`);
+                continue;
+            }
             said.push(`${at} reaches \`${named}\`, so emitting it would leave this app importing the framework while it runs. ` +
                 'It reaches what is emitted beside it, or nothing of this framework at all.');
         }
+        kept.add(where);
+        const to = join(root, where);
+        if (checking) {
+            if (!existsSync(to) || readFileSync(to, 'utf8') !== shipped) {
+                said.push(`${where} is not what this app emits from ${packageOf('ui')}. An emitted file that differs from ` +
+                    'its source is a hand edit wearing a generated name. Run `thread compositions` and commit what it writes.');
+            }
+        }
+        else {
+            writeFileSync(to, shipped, 'utf8');
+        }
     };
     for (const one of entries)
         walk(one);
@@ -266,6 +314,11 @@ export const SCREENED_BY = 'thread screens';
 const SHIPS = `${COMPILED}/ui/`;
 const idFor = (at) => `compiled-${at.slice(COMPILED.length + 1).replace(/\.[^./]+$/, '').split('/').join('-')}`;
 function meaning(at, by) {
+    if (at.startsWith(FROM_CORE)) {
+        return ('`' + at.slice(FROM_CORE.length) + '` from ' + CORE + ', copied into this app beside the interface that imports it. ' +
+            'It imports nothing itself, so a page runs it with nothing of the framework installed. `' + by + '` writes it, so an ' +
+            'edit made here is refused.');
+    }
     if (at.startsWith(SHIPS)) {
         return ('`' + at.slice(SHIPS.length) + '` from ' + packageOf('ui') + ', copied into this app so a page runs it with nothing of ' +
             'the framework installed. `' + by + '` writes it, so an edit made here is refused.');

package/dist/ui/compositions.ts

@@ -1,12 +1,13 @@
 import { existsSync, readFileSync, readdirSync, rmSync, writeFileSync } from '@prestack/thread/integrations/disk'
 import { basename, dirname, join, relative } from 'node:path'
 import { argv, stdout } from 'node:process'
+import ts from 'typescript'
 
 import { SHAPED } from '@prestack/thread/core/init'
 import { exit, invoked } from '@prestack/thread/core/invoked'
 import { quoted, valuesIn } from '@prestack/thread/core/rows'
 import type { Threaded } from '@prestack/thread/core/thread'
-import { named as packageOf } from '@prestack/thread/core/scope'
+import { THING, named as packageOf } from '@prestack/thread/core/scope'
 import type { Tree } from '@prestack/thread/core/tree'
 import { findTree, inTree } from '@prestack/thread/core/tree'
 import { COMPILED } from '@prestack/thread/operations/capabilities'
@@ -208,7 +209,26 @@ export function settled(
 
 const ORG = packageOf('ui').split('/')[0] ?? ''
 
-const REACHED = /^(?:import|export)\s+(type\s+)?(?:(?:[^\n]|\n(?=[ \t}]))*?\s)?from\s*['"]([^'"]+)['"]/gm
+const CORE = packageOf('core')
+
+const FROM_CORE = `${COMPILED}/${THING}/`
+
+interface Reached {
+  readonly from: string
+  readonly typed: boolean
+}
+
+export function reachedIn(at: string, text: string): readonly Reached[] {
+  const file = ts.createSourceFile(at, text, ts.ScriptTarget.Latest, false, at.endsWith('.tsx') ? ts.ScriptKind.TSX : ts.ScriptKind.TS)
+  const found: Reached[] = []
+  for (const one of file.statements) {
+    if (!ts.isImportDeclaration(one) && !ts.isExportDeclaration(one)) continue
+    const said = one.moduleSpecifier
+    if (said === undefined || !ts.isStringLiteral(said)) continue
+    found.push({ from: said.text, typed: ts.isImportDeclaration(one) ? one.importClause?.isTypeOnly === true : one.isTypeOnly })
+  }
+  return found
+}
 
 export const RUNTIME: readonly string[] = ['wrappers.tsx', 'drag.ts', 'provider.tsx', 'islands/map.ts']
 
@@ -246,6 +266,29 @@ export function emitting(
     ]
   }
   const seen = new Set<string>()
+  const core = join(root, 'node_modules', CORE, 'dist')
+  const copied = (path: string): string | undefined => {
+    const file = join(core, `${path}.ts`)
+    if (!existsSync(file)) return undefined
+    const text = readFileSync(file, 'utf8')
+    if (reachedIn(path, text).length > 0) return undefined
+    const where = `${FROM_CORE}${path}.ts`
+    if (seen.has(where)) return where
+    seen.add(where)
+    kept.add(where)
+    const to = join(root, where)
+    if (checking) {
+      if (!existsSync(to) || readFileSync(to, 'utf8') !== text) {
+        said.push(
+          `${where} is not what this app emits from ${CORE}. An emitted file that differs from its source is a hand ` +
+            'edit wearing a generated name. Run `thread compositions` and commit what it writes.',
+        )
+      }
+    } else {
+      writeFileSync(to, text, 'utf8')
+    }
+    return where
+  }
   const walk = (at: string): void => {
     if (seen.has(at)) return
     seen.add(at)
@@ -259,20 +302,9 @@ export function emitting(
     }
     const text = readFileSync(file, 'utf8')
     const where = `${COMPILED}/ui/${at}`
-    kept.add(where)
-    const to = join(root, where)
-    if (checking) {
-      if (!existsSync(to) || readFileSync(to, 'utf8') !== text) {
-        said.push(
-          `${where} is not what this app emits from ${packageOf('ui')}. An emitted file that differs from ` +
-            'its source is a hand edit wearing a generated name. Run `thread compositions` and commit what it writes.',
-        )
-      }
-    } else {
-      writeFileSync(to, text, 'utf8')
-    }
-    for (const one of text.matchAll(REACHED)) {
-      const named = one[2] ?? ''
+    let shipped = text
+    for (const one of reachedIn(at, text)) {
+      const named = one.from
       if (named.startsWith('.')) {
         const next = slashed(join(dirname(at), named))
         if (next.startsWith('..')) {
@@ -282,7 +314,7 @@ export function emitting(
         walk(next)
         continue
       }
-      if (one[1] !== undefined) continue
+      if (one.typed) continue
       if (!named.startsWith(`${ORG}/`)) {
         const held = packaging(named)
         if (NODE.test(named) || has.has(held)) continue
@@ -293,11 +325,30 @@ export function emitting(
         )
         continue
       }
+      const copy = named.startsWith(`${CORE}/`) ? copied(named.slice(CORE.length + 1)) : undefined
+      if (copy !== undefined) {
+        const near = slashed(relative(dirname(where), copy))
+        const pointed = near.startsWith('.') ? near : `./${near}`
+        shipped = shipped.split(`'${named}'`).join(`'${pointed}'`).split(`"${named}"`).join(`"${pointed}"`)
+        continue
+      }
       said.push(
         `${at} reaches \`${named}\`, so emitting it would leave this app importing the framework while it runs. ` +
           'It reaches what is emitted beside it, or nothing of this framework at all.',
       )
     }
+    kept.add(where)
+    const to = join(root, where)
+    if (checking) {
+      if (!existsSync(to) || readFileSync(to, 'utf8') !== shipped) {
+        said.push(
+          `${where} is not what this app emits from ${packageOf('ui')}. An emitted file that differs from ` +
+            'its source is a hand edit wearing a generated name. Run `thread compositions` and commit what it writes.',
+        )
+      }
+    } else {
+      writeFileSync(to, shipped, 'utf8')
+    }
   }
   for (const one of entries) walk(one)
   return said
@@ -340,6 +391,13 @@ const SHIPS = `${COMPILED}/ui/`
 const idFor = (at: string): string => `compiled-${at.slice(COMPILED.length + 1).replace(/\.[^./]+$/, '').split('/').join('-')}`
 
 function meaning(at: string, by: string): string {
+  if (at.startsWith(FROM_CORE)) {
+    return (
+      '`' + at.slice(FROM_CORE.length) + '` from ' + CORE + ', copied into this app beside the interface that imports it. ' +
+      'It imports nothing itself, so a page runs it with nothing of the framework installed. `' + by + '` writes it, so an ' +
+      'edit made here is refused.'
+    )
+  }
   if (at.startsWith(SHIPS)) {
     return (
       '`' + at.slice(SHIPS.length) + '` from ' + packageOf('ui') + ', copied into this app so a page runs it with nothing of ' +

package/dist/ui/generators/dev.js

@@ -1,9 +1,9 @@
 import { releases, starts } from '@prestack/thread/integrations/cli';
 import { basename } from 'node:path';
-import { argv, execPath, stdout } from 'node:process';
-import { generators, settling } from '@prestack/thread/core/chain';
-import { existsSync } from '@prestack/thread/integrations/disk';
-import { CLI, exit, invoked } from '@prestack/thread/core/invoked';
+import { argv, stdout } from 'node:process';
+import { batched, generators, settling } from '@prestack/thread/core/chain';
+import { existsSync, readFileSync } from '@prestack/thread/integrations/disk';
+import { exit, invoked } from '@prestack/thread/core/invoked';
 import { named } from '@prestack/thread/core/scope';
 import { findTree } from '@prestack/thread/core/tree';
 import { programOf } from '@prestack/thread/integrations/target';
@@ -11,7 +11,7 @@ const SERVER = 'next';
 const SHIP = '--ship';
 const ENTRY = 'dev';
 const SHIPPED = 'build';
-const GATE = 'gate';
+const GATE = 'thread gate';
 const say = (line) => {
     stdout.write(line);
 };
@@ -23,8 +23,8 @@ async function run() {
     const tree = findTree();
     const shipping = argv.includes(SHIP);
     const entry = shipping ? SHIPPED : ENTRY;
-    const program = programOf(SERVER, tree.at, existsSync);
-    if (program === undefined) {
+    const found = programOf(SERVER, tree.at, existsSync, (path) => readFileSync(path, 'utf8'));
+    if (found === undefined) {
         say('thread: ' + unrunnable(SERVER) + '\n');
         return 1;
     }
@@ -38,16 +38,20 @@ async function run() {
         return 1;
     }
     say('thread: ' + basename(tree.at) + ' settled in ' + String(settled.rounds) + ' round(s); running the gate\n');
-    const gated = starts(execPath, [...CLI, GATE], { at: tree.at, shows: true });
-    if (!gated.ok) {
+    const gated = batched(tree.at, [GATE]);
+    for (const one of gated)
+        if (one.said !== '')
+            say(one.said + '\n');
+    if (!gated.every((one) => one.ok)) {
         say('thread: the gate refused this tree, and nothing is served over a red gate. What it refused is printed above.\n');
-        return gated.code === 0 ? 1 : gated.code;
+        return 1;
     }
     say('thread: the gate passed; running ' + SERVER + ' ' + entry + '\n');
     const extra = argv.slice(2).filter((one) => one !== SHIP);
     if (!shipping)
         releases();
-    const held = starts(program, [entry, ...extra], { at: tree.at, shows: true });
+    const [program = '', ...lead] = found;
+    const held = starts(program, [...lead, entry, ...extra], { at: tree.at, shows: true });
     if (!held.there) {
         say('thread: could not start ' + SERVER + ' ' + entry + ': ' + held.why + '\n');
         return 1;

package/dist/ui/generators/dev.ts

@@ -1,10 +1,10 @@
 import { releases, starts } from '@prestack/thread/integrations/cli'
 import { basename } from 'node:path'
-import { argv, execPath, stdout } from 'node:process'
+import { argv, stdout } from 'node:process'
 
-import { generators, settling } from '@prestack/thread/core/chain'
-import { existsSync } from '@prestack/thread/integrations/disk'
-import { CLI, exit, invoked } from '@prestack/thread/core/invoked'
+import { batched, generators, settling } from '@prestack/thread/core/chain'
+import { existsSync, readFileSync } from '@prestack/thread/integrations/disk'
+import { exit, invoked } from '@prestack/thread/core/invoked'
 import { named } from '@prestack/thread/core/scope'
 import { findTree } from '@prestack/thread/core/tree'
 import { programOf } from '@prestack/thread/integrations/target'
@@ -17,7 +17,7 @@ const ENTRY = 'dev'
 
 const SHIPPED = 'build'
 
-const GATE = 'gate'
+const GATE = 'thread gate'
 
 const say = (line: string): void => {
   stdout.write(line)
@@ -35,8 +35,8 @@ async function run(): Promise<number> {
   const shipping = argv.includes(SHIP)
   const entry = shipping ? SHIPPED : ENTRY
 
-  const program = programOf(SERVER, tree.at, existsSync)
-  if (program === undefined) {
+  const found = programOf(SERVER, tree.at, existsSync, (path) => readFileSync(path, 'utf8'))
+  if (found === undefined) {
     say('thread: ' + unrunnable(SERVER) + '\n')
     return 1
   }
@@ -53,16 +53,18 @@ async function run(): Promise<number> {
   }
 
   say('thread: ' + basename(tree.at) + ' settled in ' + String(settled.rounds) + ' round(s); running the gate\n')
-  const gated = starts(execPath, [...CLI, GATE], { at: tree.at, shows: true })
-  if (!gated.ok) {
+  const gated = batched(tree.at, [GATE])
+  for (const one of gated) if (one.said !== '') say(one.said + '\n')
+  if (!gated.every((one) => one.ok)) {
     say('thread: the gate refused this tree, and nothing is served over a red gate. What it refused is printed above.\n')
-    return gated.code === 0 ? 1 : gated.code
+    return 1
   }
 
   say('thread: the gate passed; running ' + SERVER + ' ' + entry + '\n')
   const extra = argv.slice(2).filter((one) => one !== SHIP)
   if (!shipping) releases()
-  const held = starts(program, [entry, ...extra], { at: tree.at, shows: true })
+  const [program = '', ...lead] = found
+  const held = starts(program, [...lead, entry, ...extra], { at: tree.at, shows: true })
   if (!held.there) {
     say('thread: could not start ' + SERVER + ' ' + entry + ': ' + held.why + '\n')
     return 1

package/dist/ui/generators/routes.js

@@ -1,12 +1,13 @@
 import { dirname, join, relative } from 'node:path';
 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.js';
 import { PRESENTATIONS } from '../door.js';
@@ -21,6 +22,11 @@ const MAP = `app/_generated/map.${'ts'}`;
 const PROVIDER = `${COMPILED}/ui/provider.tsx`;
 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) {
     try {
         const held = JSON.parse(readFileSync(join(at, 'package.json'), 'utf8'));
@@ -316,6 +322,40 @@ function page(name, at, route) {
         '',
     ].join('\n');
 }
+const pageShaped = (path) => path === pageAt(`/${path.split('/').slice(1, -1).join('/')}`);
+function unpaged(one) {
+    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, moved) {
+    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) {
     const said = typed ? ' as { of?: Record<string, string> }' : '';
     return [
@@ -532,6 +572,7 @@ async function run() {
     const shownOf = (id) => presentedIn(texts.get(id) ?? '');
     const entry = entryAmong(rows, shownOf);
     const made = [];
+    const moved = [];
     const routes = new Map();
     const screens = [];
     const reaches = reachable(at);
@@ -541,7 +582,7 @@ async function run() {
         if (typed !== undefined) {
             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;
         }
         const name = nameOf(row.at);
@@ -576,18 +617,19 @@ async function run() {
             entry: row.id === entry,
             shows: [...shows],
         });
-        if (route === undefined)
+        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;
-        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;
-        }
         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)
@@ -611,6 +653,30 @@ async function run() {
     });
     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;