@prestack/thread 0.1.3 → 0.1.4

package/dist/core/rows.js

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto';
 import ts from 'typescript';
 const PARSED = new Map();
 function tree(text) {
@@ -109,6 +110,13 @@ export function listBounds(text, list) {
     const inside = listy(held, list);
     return inside === undefined ? undefined : spanned(inside);
 }
+export function nestedBounds(text, where, parent, list) {
+    const row = rowAt(text, where, parent);
+    if (row === undefined)
+        return undefined;
+    const inside = listy(row, list);
+    return inside === undefined ? undefined : spanned(inside);
+}
 function elements(text, where) {
     let found;
     walk(tree(text), (node) => {
@@ -341,8 +349,26 @@ export function fieldIn(text, where, id, field) {
 }
 export function withField(text, where, id, field, value) {
     const held = rowAt(text, where, id);
-    if (held === undefined)
-        return undefined;
+    return held === undefined ? undefined : fieldOn(text, held, field, value);
+}
+export function withTopField(text, field, value) {
+    const held = headed(text);
+    return held === undefined ? undefined : fieldOn(text, held, field, value);
+}
+export function withoutField(text, where, id, field) {
+    const held = rowAt(text, where, id);
+    const one = held?.properties.find((each) => ts.isPropertyAssignment(each) && keyed(each) === field);
+    if (held === undefined || one === undefined)
+        return text;
+    let ends = one.getEnd();
+    if (text[ends] === ',')
+        ends += 1;
+    const line = text.lastIndexOf('\n', one.getStart());
+    if (line > held.getStart())
+        return text.slice(0, line) + text.slice(ends);
+    return text.slice(0, one.getStart()) + text.slice(text[ends] === ' ' ? ends + 1 : ends);
+}
+function fieldOn(text, held, field, value) {
     for (const one of held.properties) {
         if (!ts.isPropertyAssignment(one) || keyed(one) !== field)
             continue;
@@ -403,6 +429,9 @@ const lines = (held, pad) => {
     }
     return [String(held)];
 };
+export function marked(parts) {
+    return createHash('sha256').update(parts.join('\n')).digest('hex').slice(0, 6);
+}
 export function showing(row, only = []) {
     const held = row;
     const keys = Object.keys(held);

package/dist/core/rows.ts

@@ -1,3 +1,5 @@
+import { createHash } from 'node:crypto'
+
 import ts from 'typescript'
 
 export interface Bounds {
@@ -117,6 +119,13 @@ export function listBounds(text: string, list: string): Bounds | undefined {
   return inside === undefined ? undefined : spanned(inside)
 }
 
+export function nestedBounds(text: string, where: Bounds, parent: string, list: string): Bounds | undefined {
+  const row = rowAt(text, where, parent)
+  if (row === undefined) return undefined
+  const inside = listy(row, list)
+  return inside === undefined ? undefined : spanned(inside)
+}
+
 function elements(text: string, where: Bounds): readonly ts.ObjectLiteralExpression[] {
   let found: ts.ArrayLiteralExpression | undefined
   walk(tree(text), (node) => {
@@ -351,7 +360,26 @@ export function withField(
   value: string,
 ): string | undefined {
   const held = rowAt(text, where, id)
-  if (held === undefined) return undefined
+  return held === undefined ? undefined : fieldOn(text, held, field, value)
+}
+
+export function withTopField(text: string, field: string, value: string): string | undefined {
+  const held = headed(text)
+  return held === undefined ? undefined : fieldOn(text, held, field, value)
+}
+
+export function withoutField(text: string, where: Bounds, id: string, field: string): string {
+  const held = rowAt(text, where, id)
+  const one = held?.properties.find((each) => ts.isPropertyAssignment(each) && keyed(each) === field)
+  if (held === undefined || one === undefined) return text
+  let ends = one.getEnd()
+  if (text[ends] === ',') ends += 1
+  const line = text.lastIndexOf('\n', one.getStart())
+  if (line > held.getStart()) return text.slice(0, line) + text.slice(ends)
+  return text.slice(0, one.getStart()) + text.slice(text[ends] === ' ' ? ends + 1 : ends)
+}
+
+function fieldOn(text: string, held: ts.ObjectLiteralExpression, field: string, value: string): string | undefined {
   for (const one of held.properties) {
     if (!ts.isPropertyAssignment(one) || keyed(one) !== field) continue
     return `${text.slice(0, one.initializer.getStart())}${value}${text.slice(one.initializer.getEnd())}`
@@ -409,6 +437,10 @@ const lines = (held: unknown, pad: string): readonly string[] => {
   return [String(held)]
 }
 
+export function marked(parts: readonly string[]): string {
+  return createHash('sha256').update(parts.join('\n')).digest('hex').slice(0, 6)
+}
+
 export function showing(row: object, only: readonly string[] = []): string {
   const held = row as Record<string, unknown>
   const keys = Object.keys(held)

package/dist/core/thread.d.ts

@@ -20,7 +20,7 @@ export interface Member extends Threaded {
     readonly version: number;
 }
 export declare const PREFIXES: {
-    readonly workflow: "wf_";
-    readonly view: "vw_";
-    readonly agent: "agt_";
+    readonly workflow: 'wf_';
+    readonly view: 'vw_';
+    readonly agent: 'agt_';
 };

package/dist/core/tree.d.ts

@@ -1,3 +1,5 @@
+import { FOLDER } from '../integrations/disk.ts';
+export { FOLDER };
 export interface Tree {
     readonly at: string;
     readonly dir: string;
@@ -5,8 +7,9 @@ export interface Tree {
     readonly root: string;
 }
 export declare class UnthreadedRepositoryError extends Error {
-    constructor(from: string);
+    constructor(from: string, floor?: string);
 }
+export declare function folder(): string;
 export declare function findTree(from?: string): Tree;
 export declare function strayFiles(root: string, prefix: string, ends: string): readonly string[];
 export declare function inTree(tree: Tree, file: string): string;

package/dist/core/tree.js

@@ -1,16 +1,34 @@
-import { existsSync, readdirSync, statSync } from "./files.js";
+import { FOLDER, attached, existsSync, readdirSync, statSync } from '../integrations/disk.js';
 import { dirname, join, relative, resolve } from 'node:path';
-import { cwd } from 'node:process';
+import { cwd, env } from 'node:process';
+export { FOLDER };
 const NAMES = ['_threads', 'threads'];
 const ROOT = 'thread.ts';
 export class UnthreadedRepositoryError extends Error {
-    constructor(from) {
-        super(`no tree above ${from} — looked for a ${NAMES.map((one) => `${one}/`).join(' or ')} directory in every directory up to the filesystem root. ` +
+    constructor(from, floor) {
+        super('no tree above ' + from + ' — looked for a ' + NAMES.map((one) => one + '/').join(' or ') + ' directory in every directory up to ' + (floor === undefined ? 'the filesystem root' : floor + ', the folder this was pointed at') + '. ' +
             'Run `thread init` to write one.');
         this.name = 'UnthreadedRepositoryError';
     }
 }
-export function findTree(from = cwd()) {
+function given() {
+    const named = env[FOLDER];
+    return named === undefined ? '' : named;
+}
+export function folder() {
+    const named = given();
+    if (named !== '')
+        return resolve(named);
+    if (attached())
+        throw new Error('this is answering for a tree on another machine and nothing said which folder that is. ' +
+            FOLDER +
+            ' carries it and is not set here. Falling back to the folder this process was started in would read ' +
+            'the wrong tree and report it as yours, so it stopped instead.');
+    return cwd();
+}
+export function findTree(from = folder()) {
+    const named = given();
+    const floor = attached() && named !== '' ? resolve(named) : undefined;
     let at = resolve(from);
     for (;;) {
         for (const name of NAMES) {
@@ -20,7 +38,9 @@ export function findTree(from = cwd()) {
         }
         const up = dirname(at);
         if (up === at)
-            throw new UnthreadedRepositoryError(from);
+            throw new UnthreadedRepositoryError(from, floor);
+        if (at === floor)
+            throw new UnthreadedRepositoryError(from, floor);
         at = up;
     }
 }

package/dist/core/tree.ts

@@ -1,6 +1,8 @@
-import { existsSync, readdirSync, statSync } from './files.ts'
+import { FOLDER, attached, existsSync, readdirSync, statSync } from '../integrations/disk.ts'
 import { dirname, join, relative, resolve } from 'node:path'
-import { cwd } from 'node:process'
+import { cwd, env } from 'node:process'
+
+export { FOLDER }
 
 const NAMES = ['_threads', 'threads'] as const
 const ROOT = 'thread.ts'
@@ -13,16 +15,36 @@ export interface Tree {
 }
 
 export class UnthreadedRepositoryError extends Error {
-  constructor(from: string) {
+  constructor(from: string, floor?: string) {
     super(
-      `no tree above ${from} — looked for a ${NAMES.map((one) => `${one}/`).join(' or ')} directory in every directory up to the filesystem root. ` +
+      'no tree above ' + from + ' — looked for a ' + NAMES.map((one) => one + '/').join(' or ') + ' directory in every directory up to ' + (floor === undefined ? 'the filesystem root' : floor + ', the folder this was pointed at') + '. ' +
         'Run `thread init` to write one.',
     )
     this.name = 'UnthreadedRepositoryError'
   }
 }
 
-export function findTree(from: string = cwd()): Tree {
+function given(): string {
+  const named = env[FOLDER]
+  return named === undefined ? '' : named
+}
+
+export function folder(): string {
+  const named = given()
+  if (named !== '') return resolve(named)
+  if (attached())
+    throw new Error(
+      'this is answering for a tree on another machine and nothing said which folder that is. ' +
+        FOLDER +
+        ' carries it and is not set here. Falling back to the folder this process was started in would read ' +
+        'the wrong tree and report it as yours, so it stopped instead.',
+    )
+  return cwd()
+}
+
+export function findTree(from: string = folder()): Tree {
+  const named = given()
+  const floor = attached() && named !== '' ? resolve(named) : undefined
   let at = resolve(from)
   for (;;) {
     for (const name of NAMES) {
@@ -30,7 +52,8 @@ export function findTree(from: string = cwd()): Tree {
       if (existsSync(dir) && statSync(dir).isDirectory()) return { at, dir, name, root: join(dir, ROOT) }
     }
     const up = dirname(at)
-    if (up === at) throw new UnthreadedRepositoryError(from)
+    if (up === at) throw new UnthreadedRepositoryError(from, floor)
+    if (at === floor) throw new UnthreadedRepositoryError(from, floor)
     at = up
   }
 }

package/dist/core/types.d.ts

@@ -1,8 +1,8 @@
-export declare const VALUE_TYPES: readonly ["text", "number", "boolean", "date", "timestamp", "json"];
+export declare const VALUE_TYPES: readonly ['text', 'number', 'boolean', 'date', 'timestamp', 'json'];
 export type ValueType = (typeof VALUE_TYPES)[number];
-export declare const KEYBOARDS: readonly ["text", "numeric", "decimal", "tel", "email", "url", "search"];
+export declare const KEYBOARDS: readonly ['text', 'numeric', 'decimal', 'tel', 'email', 'url', 'search'];
 export type Keyboard = (typeof KEYBOARDS)[number];
-export declare const ENTRY_MODES: readonly ["plain", "calculator", "masked"];
+export declare const ENTRY_MODES: readonly ['plain', 'calculator', 'masked'];
 export type EntryMode = (typeof ENTRY_MODES)[number];
 export type Checked = {
     readonly ok: true;

package/dist/core/types.js

@@ -233,7 +233,9 @@ export const FORMATS = [
         check: instant,
         requires: ['now'],
         shown: (value, facts) => {
-            const now = facts.now ?? Date.parse(new Date().toISOString());
+            const now = facts.now;
+            if (now === undefined)
+                return String(value);
             const gap = Date.parse(String(value)) - now;
             const UNITS = [
                 ['year', 31_536_000_000],

package/dist/core/types.ts

@@ -270,7 +270,8 @@ export const FORMATS: readonly Format[] = [
     check: instant,
     requires: ['now'],
     shown: (value, facts) => {
-      const now = facts.now ?? Date.parse(new Date().toISOString())
+      const now = facts.now
+      if (now === undefined) return String(value)
       const gap = Date.parse(String(value)) - now
       const UNITS: readonly (readonly [Intl.RelativeTimeFormatUnit, number])[] = [
         ['year', 31_536_000_000],

package/dist/derivation/attach.js

@@ -1,4 +1,4 @@
-import { quoted } from "../core/rows.js";
+import { quoted } from '../core/rows.js';
 const DESCRIBES = 'What turns a declaration into a file: the rows that state something is to be made, and the generators that make it. They are kept apart so you can read what an app declares without opening the machinery that builds it.';
 const DERIVATION_SOURCE = [
     "import type { Threaded } from '../core/thread.ts'",

package/dist/derivation/generators/build.js

@@ -10,12 +10,12 @@ import { relative, resolve } from 'node:path';
 import { argv, stderr, stdout } from 'node:process';
 import { pathToFileURL } from 'node:url';
 import { build } from 'esbuild';
-import { descend, reached } from "../../core/descend.js";
-import { existsSync, readFileSync } from "../../core/files.js";
-import { exit, invoked } from "../../core/invoked.js";
-import { valuesIn } from "../../core/rows.js";
-import { findTree } from "../../core/tree.js";
-import { servesBrowser } from "../../integrations/target.js";
+import { descend, reached } from '../../core/descend.js';
+import { existsSync, readFileSync } from '../../integrations/disk.js';
+import { exit, invoked } from '../../core/invoked.js';
+import { valuesIn } from '../../core/rows.js';
+import { findTree } from '../../core/tree.js';
+import { servesBrowser } from '../../integrations/target.js';
 const TREE = findTree();
 const ROOT = TREE.at;
 const OUTSIDE = /(^|\/)node_modules(\/|$)/;

package/dist/derivation/generators/build.ts

@@ -5,7 +5,7 @@ import { pathToFileURL } from 'node:url'
 import { build } from 'esbuild'
 
 import { descend, reached, type Pass } from '../../core/descend.ts'
-import { existsSync, readFileSync } from '../../core/files.ts'
+import { existsSync, readFileSync } from '../../integrations/disk.ts'
 import { exit, invoked } from '../../core/invoked.ts'
 import { valuesIn } from '../../core/rows.ts'
 import { findTree } from '../../core/tree.ts'

package/dist/derivation/generators/check.js

@@ -1,4 +1,4 @@
-import { bodyHash, parseGenerated } from "./determinism.js";
+import { bodyHash, parseGenerated } from './determinism.js';
 export function checkGenerated(expected, read, options = {}) {
     const checks = [];
     const expectedPaths = new Set(expected.map((file) => file.path));

package/dist/derivation/generators/determinism.js

@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto';
-import { named } from "../../core/scope.js";
+import { named } from '../../core/scope.js';
 export function sortedBy(items, key) {
     return [...items].sort((a, b) => compare(key(a), key(b)));
 }

package/dist/derivation/generators/release.js

@@ -1,14 +1,14 @@
 import { join } from 'node:path';
 import { argv, stderr, stdout } from 'node:process';
-import { marked, wordsIn } from "../../core/answers.js";
-import { existsSync, readFileSync, writeFileSync } from "../../core/files.js";
-import { exit, invoked } from "../../core/invoked.js";
-import { valuesIn } from "../../core/rows.js";
-import { ours } from "../../core/scope.js";
-import { findTree, inTree } from "../../core/tree.js";
-import { CHECKED_BY, KINDS, LISTENS, SAID, WRITES, WRITTEN_BY, kindOf } from "../release.js";
+import { existsSync, readFileSync, writeFileSync } from '../../integrations/disk.js';
+import { exit, invoked } from '../../core/invoked.js';
+import { marked, valuesIn } from '../../core/rows.js';
+import { ours } from '../../core/scope.js';
+import { findTree, inTree } from '../../core/tree.js';
+import { CHECKED_BY, KINDS, LISTENS, SAID, WRITES, WRITTEN_BY, kindOf } from '../release.js';
 const TREE = findTree();
 const MANIFEST = 'package.json';
+const addressed = (rows) => rows.flatMap((one) => [...(one.at === undefined ? [] : [one.at]), ...addressed(one.derives ?? [])]);
 const mark = (one) => marked([one.id ?? '', one.at ?? '']);
 function releases() {
     const at = inTree(TREE, 'derivation.ts');
@@ -22,45 +22,41 @@ function releases() {
         return [];
     }
 }
-function named() {
-    const at = inTree(TREE, 'secrets.ts');
-    if (!existsSync(at))
-        return [];
+function manager() {
     try {
-        const held = valuesIn(readFileSync(at, 'utf8'));
-        return (held.SECRETS ?? []).map((one) => one.id.toUpperCase()).sort();
+        const held = JSON.parse(readFileSync(join(TREE.at, MANIFEST), 'utf8'));
+        const said = typeof held.packageManager === 'string' ? held.packageManager.split('@')[0] : undefined;
+        return said === undefined || said === '' ? 'npm' : said;
     }
     catch {
-        return [];
+        return 'npm';
     }
 }
 function scripted() {
-    try {
-        const held = JSON.parse(readFileSync(join(TREE.at, MANIFEST), 'utf8'));
-        const scripts = held.scripts ?? {};
-        return {
-            build: scripts['build'] === undefined ? 'npm run build' : 'npm run build',
-            start: scripts['start'] === undefined ? 'npm start' : 'npm start',
-        };
-    }
-    catch {
-        return { build: 'npm run build', start: 'npm start' };
-    }
+    const tool = manager();
+    return { build: `${tool} run build`, start: tool === 'npm' ? 'npm start' : `${tool} start` };
 }
 function dockerfile(build, start) {
+    const tool = manager();
+    const corepack = tool === 'npm' ? [] : ['RUN corepack enable'];
+    const lock = tool === 'npm' ? 'package-lock.json*' : `${tool}-lock.yaml*`;
+    const first = tool === 'npm'
+        ? 'RUN npm ci --omit=dev --ignore-scripts || npm install --omit=dev --ignore-scripts'
+        : `RUN ${tool} install --prod --frozen-lockfile --ignore-scripts || ${tool} install --prod --ignore-scripts`;
+    const all = tool === 'npm' ? 'RUN npm install --ignore-scripts' : `RUN ${tool} install --ignore-scripts`;
     return [
-        '# GENERATED by thread — do not edit. It is derived from what this app declares.',
-        '',
         'FROM node:22-slim AS build',
         'WORKDIR /app',
-        'COPY package.json package-lock.json* ./',
-        'RUN npm ci --omit=dev --ignore-scripts || npm install --omit=dev --ignore-scripts',
+        ...corepack,
+        `COPY package.json ${lock} ./`,
+        first,
         'COPY . .',
-        'RUN npm install --ignore-scripts',
+        all,
         `RUN ${build}`,
         '',
         'FROM node:22-slim',
         'WORKDIR /app',
+        ...corepack,
         'ENV NODE_ENV=production',
         'COPY --from=build /app ./',
         `EXPOSE ${String(LISTENS)}`,
@@ -68,28 +64,27 @@ function dockerfile(build, start) {
         '',
     ].join('\n');
 }
-function compose(id, secrets) {
+function compose(id) {
     return [
-        '# GENERATED by thread — do not edit. It is derived from what this app declares.',
-        '',
         'services:',
         `  ${id}:`,
         '    build: .',
         '    ports:',
         `      - "${String(LISTENS)}:${String(LISTENS)}"`,
-        ...(secrets.length === 0
-            ? []
-            : [
-                '    environment:',
-                ...secrets.map((one) => `      ${one}: \${${one}}`),
-            ]),
+        '',
+    ].join('\n');
+}
+function withheld() {
+    return [
+        '.thread',
+        'node_modules',
+        '.git',
         '',
     ].join('\n');
 }
 function made() {
     const found = new Map();
     const rows = releases();
-    const secrets = named();
     const { build, start } = scripted();
     for (const one of rows) {
         const id = one.id;
@@ -100,7 +95,8 @@ function made() {
             continue;
         if (kind === 'docker') {
             found.set('Dockerfile', dockerfile(build, start));
-            found.set('compose.yaml', compose(id, secrets));
+            found.set('compose.yaml', compose(id));
+            found.set('.dockerignore', withheld());
         }
     }
     return found;
@@ -120,7 +116,12 @@ function run() {
             `\`thread create release\` — it is ${KINDS.join(' or ')}, and the prefix on its id says which.\n`);
         return 0;
     }
-    const words = wordsIn(['read']);
+    const words = argv.slice(2).filter((one) => !one.startsWith('-'));
+    if (words[0] !== undefined && words[0] !== 'read') {
+        stderr.write('release: `' + words[0] + '` is not something this command does. `thread release` writes the release, and ' +
+            '`thread release read <mark>` prints one. Nothing was written.\n');
+        return 1;
+    }
     if (words[0] === 'read') {
         const which = words[1];
         const one = rows.find((row) => mark(row) === which);
@@ -132,10 +133,10 @@ function run() {
         }
         const kind = kindOf(one.id ?? '');
         stdout.write(`${String(one.id)} — ${kind === undefined ? 'a release of a kind this generator does not recognise' : SAID[kind]}\n`);
-        for (const file of kind === undefined ? [] : WRITES[kind]) {
-            stdout.write(`\n${file}\n`);
+        for (const one of kind === undefined ? [] : WRITES[kind]) {
+            stdout.write(`\n${one.at} — ${one.describes}\n`);
             try {
-                stdout.write(readFileSync(join(TREE.at, file), 'utf8'));
+                stdout.write(readFileSync(join(TREE.at, one.at), 'utf8'));
             }
             catch {
                 stdout.write('(nothing is there)\n');
@@ -145,6 +146,16 @@ function run() {
     }
     const files = made();
     const checking = argv.includes('--check');
+    const stated = new Set(addressed(rows));
+    const stray = [...files.keys()].filter((one) => !stated.has(one));
+    if (stray.length > 0) {
+        stderr.write(`release: this release produces ${stray.join(', ')}, and no row names ${stray.length === 1 ? 'it' : 'them'}. ` +
+            `Writing ${stray.length === 1 ? 'it' : 'them'} would leave a file this tree does not declare, and the descent ` +
+            'reports that three steps later as a file nobody can account for. Take the release out with `thread remove ' +
+            '<its id>` and declare it again — the maker writes one row per file this kind produces, so all of them arrive ' +
+            'together. Nothing was written.\n');
+        return 1;
+    }
     const shipped = installed();
     if (shipped.length > 0) {
         stderr.write(`release: this app installs ${shipped.join(', ')} as a dependency, and what a host runs may hold ` +
@@ -176,8 +187,10 @@ function run() {
     }
     for (const [at, text] of files)
         writeFileSync(join(TREE.at, at), text, 'utf8');
-    stdout.write(`release: wrote ${[...files.keys()].join(', ')} — built and started by what this app's own manifest ` +
-        `declares, listening on ${String(LISTENS)}, naming ${String(named().length)} secret(s) and holding none of them.\n`);
+    stdout.write('release: wrote ' + [...files.keys()].join(', ') + ' — built and started by what this app\'s own manifest ' +
+        'declares, listening on ' + String(LISTENS) + '.\n' +
+        'release: no secret is named there. A secret is read from the sealed store at the moment it is used, and ' +
+        'naming it here would be telling whoever deploys this to put a credential in the environment instead.\n');
     return 0;
 }
 if (invoked(import.meta.url))