@prestack/thread-ui 0.0.1 → 0.1.0

package/dist/ui/generators/dev.ts

@@ -0,0 +1,80 @@
+import { spawnSync } from 'node:child_process'
+import { writeSync } from 'node:fs'
+import { basename, join } from 'node:path'
+import { argv } from 'node:process'
+
+import { generators, settling } from '@prestack/thread/core/chain'
+import { existsSync, readFileSync } from '@prestack/thread/core/files'
+import { exit, invoked } from '@prestack/thread/core/invoked'
+import { named } from '@prestack/thread/core/scope'
+import { findTree } from '@prestack/thread/core/tree'
+
+const MANIFEST = 'package.json'
+
+const SHIP = '--ship'
+
+const ENTRY = 'dev'
+
+const SHIPPED = 'build'
+
+const say = (line: string): void => {
+  writeSync(1, line)
+}
+
+interface Manifest {
+  readonly scripts?: Record<string, string>
+}
+
+export function declared(at: string, entry: string, read: (where: string) => string | undefined): string | undefined {
+  const source = read(join(at, MANIFEST))
+  if (source === undefined) return undefined
+  return (JSON.parse(source) as Manifest).scripts?.[entry]
+}
+
+export function unrunnable(entry: string, said: string | undefined): string | undefined {
+  if (said !== undefined) return undefined
+  return (
+    `this app's ${MANIFEST} declares no \`${entry}\` script, so there is nothing here to run. ` +
+    `\`thread attach ${named('integrity')}\` is what writes it, along with the \`thread gate\` hook that ` +
+    'stands in front of it — run the attach and try again.'
+  )
+}
+
+async function run(): Promise<number> {
+  const tree = findTree()
+  const shipping = argv.includes(SHIP)
+  const entry = shipping ? SHIPPED : ENTRY
+  const read = (where: string): string | undefined => (existsSync(where) ? readFileSync(where, 'utf8') : undefined)
+
+  const refused = unrunnable(entry, declared(tree.at, entry, read))
+  if (refused !== undefined) {
+    say(`thread: ${refused}\n`)
+    return 1
+  }
+
+  const settled = settling(tree.at, await generators(tree))
+  for (const said of settled.ran) if (said.trim() !== '') say(`${said}\n`)
+
+  if (settled.unsettled.length > 0) {
+    say(
+      `thread: ${settled.unsettled.join(', ')} would not settle after ${String(settled.rounds)} rounds, ` +
+        'so what this tree declares and what is written from it still disagree. Nothing is served over that.\n',
+    )
+    return 1
+  }
+
+  say(`thread: ${basename(tree.at)} settled in ${String(settled.rounds)} round(s); running \`${entry}\`\n`)
+
+  const extra = argv.slice(2).filter((one) => one !== SHIP)
+  const held = spawnSync('npm', ['run', entry, ...(extra.length === 0 ? [] : ['--', ...extra])], {
+    cwd: tree.at,
+    stdio: 'inherit',
+  })
+  if (held.error !== undefined) {
+    say(`thread: could not start \`npm run ${entry}\` — ${held.error.message}\n`)
+    return 1
+  }
+  return held.status ?? 1
+}
+
+if (invoked(import.meta.url)) exit(await run())

package/dist/ui/generators/elements.d.ts

@@ -17,15 +17,5 @@ export declare function translated(name: string, tag: string | Readonly<Record<s
 }, carries?: Readonly<Record<string, string>>, always?: readonly string[], places?: Readonly<Record<string, Readonly<Record<string, string>>>>, works?: string, measures?: readonly string[], reads?: string, gives?: readonly string[], keeps?: boolean, animates?: boolean, says?: string, called?: string, wires?: string, dresses?: string): string;
 export declare const CARRIES: readonly string[];
 export declare const READINGS: readonly string[];
-export declare const APP: {
-    readonly wrappers: `${string}/wrappers`;
-    readonly content: `${string}/content`;
-    readonly rows: `${string}/charts`;
-    readonly validators: `${string}/validators`;
-    readonly fonts: `${string}/fonts`;
-    readonly map: `${string}/islands/map`;
-    readonly parts: `${string}/disclosure`;
-    readonly consent: `${string}/consent`;
-    readonly drag: `${string}/drag`;
-};
 export declare const declared: Set<string>;
+export declare const wears: Map<string, Readonly<Record<string, string>>>;

package/dist/ui/generators/elements.js

@@ -6,14 +6,13 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     }
     return path;
 };
-import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync, writeFileSync } from "@prestack/thread/core/files";
 import { join, resolve } from 'node:path';
 import { argv, stdout } from 'node:process';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { exit, invoked } from "@prestack/thread/core/invoked";
-import { named as packageOf } from "@prestack/thread/core/scope";
 import { findTree, inTree } from "@prestack/thread/core/tree";
-import { classOfElement, looking } from "../variant.js";
+import { camel, classOf, classOfElement, looking } from "../variant.js";
 const idOf = (name) => name.replace(/([a-z0-9])([A-Z])/g, '$1-$2').toLowerCase();
 export function pascal(id) {
     return id
@@ -39,6 +38,10 @@ export function owned(body, rows) {
 }
 export function translated(name, tag, arranges, raises, from, carries = {}, always = [], places = {}, works, measures = [], reads, gives = [], keeps = false, animates = false, says, called, wires, dresses) {
     const made = pascal(name);
+    const dressing = wears.get(name);
+    if (dressing === undefined) {
+        throw new Error(`\`${name}\` is written before the variant rows that wear it were read, so it would ship wearing none of them`);
+    }
     const invoking = [
         ...(carries['dispatch'] === undefined ? ['  readonly dispatch?: string'] : []),
         ...(carries['input'] === undefined ? ['  readonly input?: Readonly<Record<string, unknown>>'] : []),
@@ -184,7 +187,7 @@ export function translated(name, tag, arranges, raises, from, carries = {}, alwa
                     'reorders. Name the field with `by`, or state `keyed: \'position\'` where position IS identity.');
             }
             return (`${pad}{props.${over}.map((${`each${String(rows.length)}`}, at) => (\n` +
-                `${region(place, depth + 2, [...rows, `each${String(rows.length)}`], true).replace(`<${(places[place] ?? {})['tag'] ?? 'span'}`, `<${(places[place] ?? {})['tag'] ?? 'span'} key={at}`)}\n` +
+                `${region(place, depth + 2, [...rows, `each${String(rows.length)}`], true).replace(`<${as}`, `<${as} key={at}`)}\n` +
                 `${pad}))}`);
         }
         return (`${pad}<Each rows={${carries[over] === undefined ? `${over}(props${keeps ? ', kept' : ''})` : `props.${over}`}} by={${carries[by] === undefined ? `'${by}'` : `props.${by}`}}>\n` +
@@ -290,9 +293,8 @@ export function translated(name, tag, arranges, raises, from, carries = {}, alwa
             ...always.map((one) => `      '${one}' as const,`),
             ...raises.map((one) => `      ...(props.${one} === true ? ['${one}' as const] : []),`),
             ...(keeps ? ['      ...(kept.holds ?? []),'] : []),
-        ].join('\n')}\n    ],`;
-    return `/* GENERATED by thread — do not edit. Change the row and run \`thread elements\`. */
-'use client'
+        ].join('\n')}\n    ],${raises.length === 0 ? '' : `\n    raises: [${raises.map((one) => `'${one}' as const`).join(', ')}],`}`;
+    return `'use client'
 
 ${[
         ...(arranges || stated.some(([, kind]) => KINDS[kind]?.from === 'react' || KINDS[kind]?.from === 'both')
@@ -334,6 +336,7 @@ ${keeps ? '    const kept = uses(props)\n' : ''}    const surface = useSurface({
     )
   },
   '${classOfElement(name)}',
+  ${JSON.stringify(dressing)},
 )
 `;
 }
@@ -424,17 +427,30 @@ const READS = {
 };
 export const CARRIES = Object.keys(KINDS);
 export const READINGS = Object.keys(READS);
-const UI = packageOf('ui');
-export const APP = { wrappers: `${UI}/wrappers`, content: `${UI}/content`, rows: `${UI}/charts`, validators: `${UI}/validators`, fonts: `${UI}/fonts`, map: `${UI}/islands/map`, parts: `${UI}/disclosure`, consent: `${UI}/consent`, drag: `${UI}/drag` };
-const OWN = { wrappers: '../wrappers.tsx', content: '../content.tsx', rows: '../charts.tsx', validators: '../validators.ts', fonts: '../fonts.ts', map: '../islands/map.ts', parts: '../disclosure.tsx', consent: '../consent.ts', drag: '../drag.ts' };
+const BESIDE = { wrappers: '../wrappers.tsx', content: '../content.tsx', rows: '../charts.tsx', validators: '../validators.ts', fonts: '../fonts.ts', map: '../islands/map.ts', parts: '../disclosure.tsx', consent: '../consent.ts', drag: '../drag.ts' };
 export const declared = new Set();
+export const wears = new Map();
 const SHEET = `elements.${'ts'}`;
 const BY = 'thread elements';
 const INSTALLED = 'node_' + 'modules/';
 function derived(row, own) {
+    if (typeof row.at !== 'string' || row.at.startsWith(INSTALLED))
+        return false;
     if ((row.derives ?? []).some((one) => one.by === BY && one.at === row.at))
         return true;
-    return !own && typeof row.at === 'string' && !row.at.startsWith(INSTALLED);
+    return own ? row.by === BY : true;
+}
+const VARIANTS_SHEET = `variants.${'ts'}`;
+async function variants(own) {
+    if (own) {
+        const held = (await import(__rewriteRelativeImportExtension(pathToFileURL(resolve(fileURLToPath(import.meta.url), '../..', VARIANTS_SHEET)).href)));
+        return held.VARIANTS?.declares ?? [];
+    }
+    const at = inTree(findTree(), VARIANTS_SHEET);
+    if (!existsSync(at))
+        return [];
+    const held = (await import(__rewriteRelativeImportExtension(pathToFileURL(at).href)));
+    return held.VARIANT?.declares ?? [];
 }
 async function run() {
     const own = argv.includes('--own');
@@ -442,19 +458,33 @@ async function run() {
         ? (await import(__rewriteRelativeImportExtension(pathToFileURL(resolve(fileURLToPath(import.meta.url), '../../elements.ts')).href)))
         : undefined;
     const tree = own ? undefined : findTree();
+    if (tree !== undefined && !existsSync(inTree(tree, SHEET))) {
+        stdout.write(`thread: this tree has no ${tree.name}/${SHEET}, so it declares no element and there is nothing to write or check.\n`);
+        return 0;
+    }
     const sheet = tree === undefined
         ? { ELEMENT: held?.ELEMENTS }
         : (await import(__rewriteRelativeImportExtension(pathToFileURL(inTree(tree, SHEET)).href)));
     if (sheet.ELEMENT === undefined) {
         stdout.write(own
-            ? 'elements: packages/ui/src/elements.ts exports no `ELEMENTS`.\n'
+            ? 'elements: thread/ui/elements.ts exports no `ELEMENTS`.\n'
             : `thread: ${String(tree?.name)}/${SHEET} exports no \`ELEMENT\`, so nothing declares an element here.\n`);
         return 1;
     }
-    const root = own ? resolve(fileURLToPath(import.meta.url), '../../../../..') : (tree?.at ?? '');
-    const from = own ? OWN : APP;
+    const root = findTree().at;
+    const from = BESIDE;
     for (const one of sheet.ELEMENT.declares ?? [])
         declared.add(one.id);
+    const dressed = await variants(own);
+    for (const one of sheet.ELEMENT.declares ?? []) {
+        const held = {};
+        for (const row of dressed) {
+            if (!row.wears.includes(pascal(one.id)))
+                continue;
+            held[camel(row.id)] = classOf(row.id);
+        }
+        wears.set(one.id, held);
+    }
     const rows = (sheet.ELEMENT.declares ?? []).filter((row) => derived(row, own));
     const checking = argv.includes('--check');
     for (const row of rows) {