@prestack/thread 0.1.4 → 0.1.6

package/dist/integrity/attach.ts

@@ -1,5 +1,6 @@
 import type { Attaching } from '../core/attach.ts'
-import { named } from '../core/scope.ts'
+import { SHAPED } from '../core/init.ts'
+import { NAMED } from '../core/scope.ts'
 
 import { quoted } from '../core/rows.ts'
 
@@ -12,7 +13,7 @@ const CONSTRAINT =
 const RULES =
   'What this app refuses on top of what the framework already does. `thread create rule` asks what to ban, where it applies and what to do instead, then writes the row and the check beside it.'
 
-const HOME = `node_modules/${named('integrity')}/dist`
+const HOME = `node_modules/${NAMED}/dist/integrity`
 
 const GATE =
   'Every surface that can refuse, each naming where it lives and the command that runs it, so the gate is derived from what this system declares rather than kept as a string beside it.'
@@ -20,7 +21,7 @@ const GATE =
 const COMPILER =
   'The compiler run over the files this app declares and no others. A type error is the plainest kind of broken build, so it is refused here rather than found by whoever runs the app next.'
 
-const INTEGRITY_SOURCE = `import type { Threaded } from '../core/thread.ts'
+const INTEGRITY_SOURCE = `import type { Threaded } from '${SHAPED}'
 
 export const INTEGRITY: Threaded = {
   id: 'integrity',
@@ -57,12 +58,12 @@ export const INTEGRITY: Threaded = {
 }
 `
 
-const RULES_SOURCE = `import type { Constraint } from './constraint.ts'
+const RULES_SOURCE = `import type { Constraint } from '${NAMED}/integrity/constraint'
 
 export const RULES: readonly Constraint[] = []
 `
 
-const GATE_SOURCE = `import type { Threaded } from '../core/thread.ts'
+const GATE_SOURCE = `import type { Threaded } from '${SHAPED}'
 
 export const GATE: Threaded = {
   id: 'gate',

package/dist/integrity/generators/compiler.js

@@ -1,11 +1,8 @@
-import { starts } from '../../integrations/cli.js';
-import { attached, readdirSync, readFileSync, writeFileSync } from '../../integrations/disk.js';
-import { createRequire } from 'node:module';
-import { dirname, join, resolve } from 'node:path';
-import { argv, execPath, stderr, stdout } from 'node:process';
+import { readdirSync, readFileSync, writeFileSync } from '../../integrations/disk.js';
+import { join, resolve } from 'node:path';
+import { argv, stderr, stdout } from 'node:process';
 import { exit } from '../../core/invoked.js';
-import { ROOT, THREAD_AT, descend } from '../../core/descend.js';
-import { MANIFEST } from '../../core/init.js';
+import { ROOT, THREAD_AT, descend, uncompiled } from '../../core/descend.js';
 import { forbids, runChecker } from '../../core/finding.js';
 function refuse(why) {
     stderr.write(`compiler: ${why}\n`);
@@ -97,32 +94,9 @@ if (argv.includes('--check')) {
             instead: 'run `thread compiler`. What the compiler reads is derived from what the tree declares — an edit here is a declaration somebody skipped, and a path put here by hand is taken back out on the next settle',
         });
     }
+    findings.push(...uncompiled());
     runChecker('compiler', findings, `${String(leave.length)} path(s) left out, over ${String(pass.declarations)} declaration(s)`);
-    if (findings.length > 0)
-        exit(1);
-    const asks = createRequire(join(ROOT, MANIFEST));
-    let cli;
-    try {
-        const manifest = asks.resolve(`typescript/${MANIFEST}`);
-        const bin = JSON.parse(readFileSync(manifest, 'utf8')).bin;
-        const named = typeof bin === 'string' ? bin : (bin?.tsc ?? Object.values(bin ?? {})[0]);
-        if (named === undefined)
-            refuse(`the installed \`typescript\` states no executable in its ${MANIFEST}, so there is nothing here to run.`);
-        cli = resolve(dirname(manifest), named);
-    }
-    catch (cause) {
-        refuse(`the compiler is not installed — ${String(cause)}. \`typescript\` is a dependency this app declares, so \`npm install\` is what puts it there.`);
-    }
-    if (attached()) {
-        stderr.write('compiler: NOT RUN. The typecheck is a separate compiler process, so it reads the disk of the machine this is\n' +
-            'running on rather than the tree being answered for. It would report on the wrong files, and a check that\n' +
-            'passed against the wrong machine says nothing about this one.\n');
-        exit(1);
-    }
-    const built = starts(execPath, [cli, '--noEmit'], { at: ROOT, shows: true });
-    if (!built.there)
-        refuse(`the compiler could not be started — ${built.why}.`);
-    exit(built.code);
+    exit(findings.length > 0 ? 1 : 0);
 }
 if (has) {
     stdout.write(`compiler: ${AT} already leaves out exactly what this tree declares nothing under.\n`);

package/dist/integrity/generators/compiler.ts

@@ -1,12 +1,11 @@
-import { starts } from '../../integrations/cli.ts'
-import { attached, readdirSync, readFileSync, writeFileSync } from '../../integrations/disk.ts'
-import { createRequire } from 'node:module'
-import { dirname, join, resolve } from 'node:path'
-import { argv, execPath, stderr, stdout } from 'node:process'
+
+import { readdirSync, readFileSync, writeFileSync } from '../../integrations/disk.ts'
+import { join, resolve } from 'node:path'
+import { argv, stderr, stdout } from 'node:process'
 
 import { exit } from '../../core/invoked.ts'
-import { ROOT, THREAD_AT, descend } from '../../core/descend.ts'
-import { MANIFEST } from '../../core/init.ts'
+import { ROOT, THREAD_AT, descend, uncompiled } from '../../core/descend.ts'
+
 import { forbids, runChecker, type Finding } from '../../core/finding.ts'
 
 function refuse(why: string): never {
@@ -123,36 +122,10 @@ if (argv.includes('--check')) {
         'run `thread compiler`. What the compiler reads is derived from what the tree declares — an edit here is a declaration somebody skipped, and a path put here by hand is taken back out on the next settle',
     })
   }
-
+  findings.push(...uncompiled())
   runChecker('compiler', findings, `${String(leave.length)} path(s) left out, over ${String(pass.declarations)} declaration(s)`)
-  if (findings.length > 0) exit(1)
-
-  const asks = createRequire(join(ROOT, MANIFEST))
-  let cli: string
-  try {
-    const manifest = asks.resolve(`typescript/${MANIFEST}`)
-    const bin = (JSON.parse(readFileSync(manifest, 'utf8')) as { bin?: string | Record<string, string> }).bin
-    const named = typeof bin === 'string' ? bin : (bin?.tsc ?? Object.values(bin ?? {})[0])
-    if (named === undefined) refuse(`the installed \`typescript\` states no executable in its ${MANIFEST}, so there is nothing here to run.`)
-    cli = resolve(dirname(manifest), named)
-  } catch (cause) {
-    refuse(
-      `the compiler is not installed — ${String(cause)}. \`typescript\` is a dependency this app declares, so \`npm install\` is what puts it there.`,
-    )
-  }
-
-  if (attached()) {
-    stderr.write(
-      'compiler: NOT RUN. The typecheck is a separate compiler process, so it reads the disk of the machine this is\n' +
-        'running on rather than the tree being answered for. It would report on the wrong files, and a check that\n' +
-        'passed against the wrong machine says nothing about this one.\n',
-    )
-    exit(1)
-  }
+  exit(findings.length > 0 ? 1 : 0)
 
-  const built = starts(execPath, [cli, '--noEmit'], { at: ROOT, shows: true })
-  if (!built.there) refuse(`the compiler could not be started — ${built.why}.`)
-  exit(built.code)
 }
 
 if (has) {

package/dist/integrity/generators/gate.js

@@ -3,7 +3,7 @@ import { createHash } from 'node:crypto';
 import { join } from 'node:path';
 import { argv, execPath, stderr, stdout } from 'node:process';
 import { descend } from '../../core/descend.js';
-import { attached, existsSync, readdirSync, readFileSync, rmSync, writeFileSync } from '../../integrations/disk.js';
+import { attached, existsSync, here, readdirSync, readFileSync, rmSync, writeFileSync } from '../../integrations/disk.js';
 import { LOADER, exit } from '../../core/invoked.js';
 import { valuesIn } from '../../core/rows.js';
 import { ORGANISATION, ours } from '../../core/scope.js';
@@ -66,6 +66,12 @@ function ran(runs) {
         stderr.write(`gate: nothing in this tree is written by \`${of}\`, so this step names a command that does not exist here\n`);
         return 1;
     }
+    if (attached()) {
+        const ordered = here().run(join(ROOT, at), said.slice(2));
+        stdout.write(ordered.out);
+        stderr.write(ordered.err);
+        return ordered.there ? ordered.code : 1;
+    }
     const spun = starts(execPath, [...LOADER, join(ROOT, at), ...said.slice(2)], spent);
     return spun.there ? spun.code : 1;
 }

package/dist/integrity/generators/gate.ts

@@ -4,7 +4,7 @@ import { dirname, join } from 'node:path'
 import { argv, execPath, stderr, stdout } from 'node:process'
 import { fileURLToPath } from 'node:url'
 import { descend } from '../../core/descend.ts'
-import { attached, existsSync, readdirSync, readFileSync, rmSync, writeFileSync } from '../../integrations/disk.ts'
+import { attached, existsSync, here, readdirSync, readFileSync, rmSync, writeFileSync } from '../../integrations/disk.ts'
 import { LOADER, exit } from '../../core/invoked.ts'
 import { valuesIn } from '../../core/rows.ts'
 import { ORGANISATION, ours } from '../../core/scope.ts'
@@ -95,6 +95,13 @@ function ran(runs: string): number {
     return 1
   }
 
+  if (attached()) {
+    const ordered = here().run(join(ROOT, at), said.slice(2))
+    stdout.write(ordered.out)
+    stderr.write(ordered.err)
+    return ordered.there ? ordered.code : 1
+  }
+
   const spun = starts(execPath, [...LOADER, join(ROOT, at), ...said.slice(2)], spent)
   return spun.there ? spun.code : 1
 }

package/dist/integrity/slopnator.js

@@ -126,7 +126,7 @@ export async function load(root, all) {
     for (const rule of all) {
         const name = slopnatorName(rule.id);
         const at = homes(root)
-            .flatMap((dir) => [join(dir, `${name}.ts`), join(dir, `${name}.js`)])
+            .flatMap((dir) => [join(dir, `${name}.js`), join(dir, `${name}.ts`)])
             .find((one) => existsSync(one));
         if (at === undefined)
             continue;

package/dist/integrity/slopnator.ts

@@ -180,7 +180,7 @@ export async function load(root: string, all: readonly Constraint[]): Promise<Re
   for (const rule of all) {
     const name = slopnatorName(rule.id)
     const at = homes(root)
-      .flatMap((dir) => [join(dir, `${name}.ts`), join(dir, `${name}.js`)])
+      .flatMap((dir) => [join(dir, `${name}.js`), join(dir, `${name}.ts`)])
       .find((one) => existsSync(one))
     if (at === undefined) continue
 

package/dist/knowledge/attach.js

@@ -1,7 +1,8 @@
+import { SHAPED } from '../core/init.js';
 import { quoted } from '../core/rows.js';
 const DESCRIBES = 'The system that compiles what this repository holds into forms a reader can understand — the glossary first, and every later view of the tree computed rather than written.';
 const CONCEPTS = 'Every word this framework means something specific by that no declaration coins — its own verbs and the fields they sit in, written by a person because nothing in the tree can state them, and read into the glossary with everything else.';
-const CONCEPTS_SOURCE = `import type { Member } from '../core/thread.ts'
+const CONCEPTS_SOURCE = `import type { Member } from '${SHAPED}'
 
 export interface Concept extends Member {
   readonly avoid?: readonly string[]
@@ -288,7 +289,7 @@ export const ATTACH = {
         {
             file: 'knowledge.ts',
             source: [
-                "import type { Threaded } from '../core/thread.ts'",
+                `import type { Threaded } from '${SHAPED}'`,
                 '',
                 'export const KNOWLEDGE: Threaded = {',
                 "  id: 'knowledge',",

package/dist/knowledge/attach.ts

@@ -1,5 +1,6 @@
 import type { Attaching } from '../core/attach.ts'
 
+import { SHAPED } from '../core/init.ts'
 import { quoted } from '../core/rows.ts'
 
 const DESCRIBES =
@@ -8,7 +9,7 @@ const DESCRIBES =
 const CONCEPTS =
   'Every word this framework means something specific by that no declaration coins — its own verbs and the fields they sit in, written by a person because nothing in the tree can state them, and read into the glossary with everything else.'
 
-const CONCEPTS_SOURCE = `import type { Member } from '../core/thread.ts'
+const CONCEPTS_SOURCE = `import type { Member } from '${SHAPED}'
 
 export interface Concept extends Member {
   readonly avoid?: readonly string[]
@@ -298,7 +299,7 @@ export const ATTACH: Attaching = {
     {
       file: 'knowledge.ts',
       source: [
-        "import type { Threaded } from '../core/thread.ts'",
+        `import type { Threaded } from '${SHAPED}'`,
         '',
         'export const KNOWLEDGE: Threaded = {',
         "  id: 'knowledge',",

package/dist/operations/attach.js

@@ -1,4 +1,5 @@
-import { named } from '../core/scope.js';
+import { SHAPED } from '../core/init.js';
+import { NAMED, named } from '../core/scope.js';
 import { LISTS } from '../core/descend.js';
 import { quoted } from '../core/rows.js';
 import { PERMITS_AT } from './access.js';
@@ -50,12 +51,12 @@ export const said = (one, pad) => {
 };
 const ACCESS = 'Who may ask this app to do what. A row says which operations it permits, on what, to whom, and under what condition. Nothing is permitted by default: an operation no row grants here cannot be run at all.';
 const PERMITS = 'The check compiled from the grants in _threads/access.ts: one branch per grant, so who may ask for what comes from one statement. Nobody edits it, because an edit here widens or narrows access nobody granted. An app that grants nothing permits nothing.';
-const ACCESS_SOURCE = `import type { Grant } from './access.ts'
+const ACCESS_SOURCE = `import type { Grant } from '${NAMED}/operations/access'
 
 export const GRANTS: readonly Grant[] = []
 `;
 const DEFAULTS = 'Which surfaces every operation in this app answers on, stated once for all of them. An operation turns one off with `off` on its own row and can never turn on one this row leaves off. With no `live` stated, every operation answers on cli alone, so nothing is reachable from outside the machine until this row says so. `thread create capability edit defaults` changes it.';
-const DEFAULTS_SOURCE = `import type { Defaults } from './capabilities.ts'
+const DEFAULTS_SOURCE = `import type { Defaults } from '${NAMED}/operations/capabilities'
 
 export const DEFAULTS: Defaults = {
   id: 'defaults',
@@ -218,8 +219,8 @@ const WHERE = {
     reaching: { into: OPERATIONS_FILE, list: 'declares' },
 };
 const placed = (id) => WHERE[id] ?? { into: NODES_FILE, list: MEMBERS_LIST };
-const NODES_SOURCE = `import type { Threaded } from '../core/thread.ts'
-import type { Node } from './nodes.ts'
+const NODES_SOURCE = `import type { Threaded } from '${SHAPED}'
+import type { Node } from '${NAMED}/operations/nodes'
 
 export const NODES: Threaded = {
   id: 'nodes',
@@ -231,7 +232,7 @@ export const NODES: Threaded = {
 
 export const ${MEMBERS_LIST}: readonly Node[] = []
 `;
-const OPERATIONS_SOURCE = `import type { Member, Threaded } from '../core/thread.ts'
+const OPERATIONS_SOURCE = `import type { Member, Threaded } from '${SHAPED}'
 
 export const OPERATIONS: Threaded = {
   id: 'operations',

package/dist/operations/attach.ts

@@ -1,5 +1,6 @@
 import type { Attaching } from '../core/attach.ts'
-import { named } from '../core/scope.ts'
+import { SHAPED } from '../core/init.ts'
+import { NAMED, named } from '../core/scope.ts'
 
 import { LISTS } from '../core/descend.ts'
 import { quoted } from '../core/rows.ts'
@@ -106,7 +107,7 @@ const ACCESS =
 const PERMITS =
   'The check compiled from the grants in _threads/access.ts: one branch per grant, so who may ask for what comes from one statement. Nobody edits it, because an edit here widens or narrows access nobody granted. An app that grants nothing permits nothing.'
 
-const ACCESS_SOURCE = `import type { Grant } from './access.ts'
+const ACCESS_SOURCE = `import type { Grant } from '${NAMED}/operations/access'
 
 export const GRANTS: readonly Grant[] = []
 `
@@ -114,7 +115,7 @@ export const GRANTS: readonly Grant[] = []
 const DEFAULTS =
   'Which surfaces every operation in this app answers on, stated once for all of them. An operation turns one off with `off` on its own row and can never turn on one this row leaves off. With no `live` stated, every operation answers on cli alone, so nothing is reachable from outside the machine until this row says so. `thread create capability edit defaults` changes it.'
 
-const DEFAULTS_SOURCE = `import type { Defaults } from './capabilities.ts'
+const DEFAULTS_SOURCE = `import type { Defaults } from '${NAMED}/operations/capabilities'
 
 export const DEFAULTS: Defaults = {
   id: 'defaults',
@@ -287,8 +288,8 @@ const WHERE: Readonly<Record<string, { readonly into: string; readonly list: str
 const placed = (id: string): { readonly into: string; readonly list: string } =>
   WHERE[id] ?? { into: NODES_FILE, list: MEMBERS_LIST }
 
-const NODES_SOURCE = `import type { Threaded } from '../core/thread.ts'
-import type { Node } from './nodes.ts'
+const NODES_SOURCE = `import type { Threaded } from '${SHAPED}'
+import type { Node } from '${NAMED}/operations/nodes'
 
 export const NODES: Threaded = {
   id: 'nodes',
@@ -301,7 +302,7 @@ export const NODES: Threaded = {
 export const ${MEMBERS_LIST}: readonly Node[] = []
 `
 
-const OPERATIONS_SOURCE = `import type { Member, Threaded } from '../core/thread.ts'
+const OPERATIONS_SOURCE = `import type { Member, Threaded } from '${SHAPED}'
 
 export const OPERATIONS: Threaded = {
   id: 'operations',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prestack/thread",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "type": "module",
   "files": [
     "dist",