@volter/twin-standard 1.0.29 → 1.0.30

package/dist/src/gate.js

@@ -16,6 +16,7 @@ import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import ts from 'typescript';
 import { grade } from "./grade.js";
+import { isPackArtifact } from "./pack-files.js";
 /** Every unit of a pack repository: each pack (a directory with a package.json) and each lane in it (a directory with
  *  its own src/manifest.ts and no package.json). */
 export function unitsOf(repo) {
@@ -50,7 +51,7 @@ export function laneRootFailures(dir) {
     const lanes = readdirSync(dir).filter((n) => existsSync(join(dir, n, 'src', 'manifest.ts')));
     if (!lanes.length)
         return ['layout: no src/manifest.ts and no lane: not a Protocol 3 pack'];
-    const stray = readdirSync(dir).filter((n) => !n.startsWith('.') && !ROOT_ENTRIES.has(n) && !lanes.includes(n));
+    const stray = readdirSync(dir).filter((n) => !isPackArtifact(n) && !n.startsWith('.') && !ROOT_ENTRIES.has(n) && !lanes.includes(n));
     const skip = ignored(dir, stray);
     const outside = [
         ...stray.filter((n) => !skip.has(n)),

package/dist/src/pack-files.d.ts

@@ -0,0 +1,2 @@
+/** Release outputs and runtime state, relative to the pack directory being listed. */
+export declare function isPackArtifact(path: string): boolean;

package/dist/src/pack-files.js

@@ -0,0 +1,4 @@
+/** Release outputs and runtime state, relative to the pack directory being listed. */
+export function isPackArtifact(path) {
+    return /^(dist|node_modules|\.volter)(\/|$)/.test(path) || path === 'generated/pack-facts.json';
+}

package/dist/src/protocol-3.js

@@ -21,6 +21,7 @@ import { gunzipSync } from 'node:zlib';
 import ts from 'typescript';
 import { fileURLToPath } from 'node:url';
 import { sharingLanesIn } from "./lanes.js";
+import { isPackArtifact } from "./pack-files.js";
 /** The lanes over the unit's vendor's state, when the unit is one of them ("Pack layout"), else none: a lane over its
  *  vendor's state takes the vendor's states, shared helpers, manifest and engine from the vendor's src/, and nothing of
  *  another lane. */
@@ -56,24 +57,36 @@ function specFiles(unit) {
     const dir = join(unit.dir, 'spec');
     return filesUnder(dir).filter((f) => !SPEC_METADATA.test(f) && !SPEC_TOOL.test(f)).map((f) => join(dir, f));
 }
-/** Every file under a directory git does not ignore, relative to it (the checkout's tree, never runtime state). */
+/** Files relative to a directory: Git's tree in a checkout, the disk tree of an unpacked package outside one. */
 function filesUnder(dir, base = dir) {
     if (!existsSync(dir))
         return [];
+    const checkout = spawnSync('git', ['rev-parse', '--is-inside-work-tree'], { cwd: dir, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
+    if (checkout.status !== 0 || checkout.error || checkout.stdout.trim() !== 'true') {
+        if (checkout.status !== null && checkout.status !== 0 && !checkout.error && !checkout.signal
+            && /^fatal: not a git repository(?:[ (:]|$)/m.test(String(checkout.stderr ?? '')))
+            return allFilesUnder(dir, base, true);
+        throw new Error(`git rev-parse failed: directory=${JSON.stringify(dir)} status=${checkout.status} signal=${JSON.stringify(checkout.signal)} error=${JSON.stringify(checkout.error?.message ?? null)} stdout=${JSON.stringify(String(checkout.stdout ?? '').trim())} stderr=${JSON.stringify(String(checkout.stderr ?? '').trim())}`);
+    }
     // tracked and not-yet-added files alike (T0 runs before the commit); ignored runtime state (.volter) never
-    const run = spawnSync('git', ['ls-files', '-z', '--cached', '--others', '--exclude-standard', '--', '.'], { cwd: dir, stdio: ['ignore', 'pipe', 'ignore'] });
-    const tracked = run.status === 0 ? [...new Set(String(run.stdout).split('\0').filter(Boolean))] : [];
+    const run = spawnSync('git', ['ls-files', '-z', '--cached', '--others', '--exclude-standard', '--', '.'], { cwd: dir, stdio: ['ignore', 'pipe', 'pipe'] });
+    if (run.status !== 0 || run.error) {
+        throw new Error(`git ls-files failed: directory=${JSON.stringify(dir)} status=${run.status} signal=${JSON.stringify(run.signal)} error=${JSON.stringify(run.error?.message ?? null)} stderr=${JSON.stringify(String(run.stderr ?? '').trim())}`);
+    }
+    const tracked = [...new Set(String(run.stdout).split('\0').filter(Boolean))];
     return tracked.map((f) => relative(base, join(dir, f))).filter((f) => existsSync(join(base, f)));
 }
-/** Every file under a directory, tracked or not (a directory the grader itself wrote). */
-function allFilesUnder(dir, base = dir) {
+/** Disk files outside a checkout, or the complete output of the grader's own derivation. */
+function allFilesUnder(dir, base = dir, excludeArtifacts = false) {
     if (!existsSync(dir))
         return [];
     const out = [];
     for (const name of readdirSync(dir)) {
         const path = join(dir, name);
+        if (excludeArtifacts && isPackArtifact(relative(base, path)))
+            continue;
         if (statSync(path).isDirectory())
-            out.push(...allFilesUnder(path, base));
+            out.push(...allFilesUnder(path, base, excludeArtifacts));
         else
             out.push(relative(base, path));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/twin-standard",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "The Protocol 3 standard for Volter twin packs: the criteria a pack is graded by, the grader, the gate a pack repository and the twin catalog run on every change and submission, and the spec derivation the grade checks against. Pin a version: every place a pack is judged judges by that standard.",
   "keywords": [
     "twin",

package/src/gate.ts

@@ -16,6 +16,7 @@ import { existsSync, readdirSync, readFileSync, statSync } from 'node:fs';
 import { join } from 'node:path';
 import ts from 'typescript';
 import { grade } from './grade.ts';
+import { isPackArtifact } from './pack-files.ts';
 
 /** Every unit of a pack repository: each pack (a directory with a package.json) and each lane in it (a directory with
  *  its own src/manifest.ts and no package.json). */
@@ -48,7 +49,7 @@ function ignored(dir: string, names: string[]): Set<string> {
 export function laneRootFailures(dir: string): string[] {
   const lanes = readdirSync(dir).filter((n) => existsSync(join(dir, n, 'src', 'manifest.ts')));
   if (!lanes.length) return ['layout: no src/manifest.ts and no lane: not a Protocol 3 pack'];
-  const stray = readdirSync(dir).filter((n) => !n.startsWith('.') && !ROOT_ENTRIES.has(n) && !lanes.includes(n));
+  const stray = readdirSync(dir).filter((n) => !isPackArtifact(n) && !n.startsWith('.') && !ROOT_ENTRIES.has(n) && !lanes.includes(n));
   const skip = ignored(dir, stray);
   const outside = [
     ...stray.filter((n) => !skip.has(n)),

package/src/pack-files.ts

@@ -0,0 +1,4 @@
+/** Release outputs and runtime state, relative to the pack directory being listed. */
+export function isPackArtifact(path: string): boolean {
+  return /^(dist|node_modules|\.volter)(\/|$)/.test(path) || path === 'generated/pack-facts.json';
+}

package/src/protocol-3.ts

@@ -13,6 +13,7 @@ import { gunzipSync } from 'node:zlib';
 import ts from 'typescript';
 import { fileURLToPath } from 'node:url';
 import { sharingLanesIn } from './lanes.ts';
+import { isPackArtifact } from './pack-files.ts';
 import type { Criterion, GradeUnit, Standard } from './types.ts';
 
 /** The lanes over the unit's vendor's state, when the unit is one of them ("Pack layout"), else none: a lane over its
@@ -46,21 +47,31 @@ function specFiles(unit: GradeUnit): string[] {
   return filesUnder(dir).filter((f) => !SPEC_METADATA.test(f) && !SPEC_TOOL.test(f)).map((f) => join(dir, f));
 }
 
-/** Every file under a directory git does not ignore, relative to it (the checkout's tree, never runtime state). */
+/** Files relative to a directory: Git's tree in a checkout, the disk tree of an unpacked package outside one. */
 function filesUnder(dir: string, base = dir): string[] {
   if (!existsSync(dir)) return [];
+  const checkout = spawnSync('git', ['rev-parse', '--is-inside-work-tree'], { cwd: dir, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'] });
+  if (checkout.status !== 0 || checkout.error || checkout.stdout.trim() !== 'true') {
+    if (checkout.status !== null && checkout.status !== 0 && !checkout.error && !checkout.signal
+      && /^fatal: not a git repository(?:[ (:]|$)/m.test(String(checkout.stderr ?? ''))) return allFilesUnder(dir, base, true);
+    throw new Error(`git rev-parse failed: directory=${JSON.stringify(dir)} status=${checkout.status} signal=${JSON.stringify(checkout.signal)} error=${JSON.stringify(checkout.error?.message ?? null)} stdout=${JSON.stringify(String(checkout.stdout ?? '').trim())} stderr=${JSON.stringify(String(checkout.stderr ?? '').trim())}`);
+  }
   // tracked and not-yet-added files alike (T0 runs before the commit); ignored runtime state (.volter) never
-  const run = spawnSync('git', ['ls-files', '-z', '--cached', '--others', '--exclude-standard', '--', '.'], { cwd: dir, stdio: ['ignore', 'pipe', 'ignore'] });
-  const tracked = run.status === 0 ? [...new Set(String(run.stdout).split('\0').filter(Boolean))] : [];
+  const run = spawnSync('git', ['ls-files', '-z', '--cached', '--others', '--exclude-standard', '--', '.'], { cwd: dir, stdio: ['ignore', 'pipe', 'pipe'] });
+  if (run.status !== 0 || run.error) {
+    throw new Error(`git ls-files failed: directory=${JSON.stringify(dir)} status=${run.status} signal=${JSON.stringify(run.signal)} error=${JSON.stringify(run.error?.message ?? null)} stderr=${JSON.stringify(String(run.stderr ?? '').trim())}`);
+  }
+  const tracked = [...new Set(String(run.stdout).split('\0').filter(Boolean))];
   return tracked.map((f) => relative(base, join(dir, f))).filter((f) => existsSync(join(base, f)));
 }
-/** Every file under a directory, tracked or not (a directory the grader itself wrote). */
-function allFilesUnder(dir: string, base = dir): string[] {
+/** Disk files outside a checkout, or the complete output of the grader's own derivation. */
+function allFilesUnder(dir: string, base = dir, excludeArtifacts = false): string[] {
   if (!existsSync(dir)) return [];
   const out: string[] = [];
   for (const name of readdirSync(dir)) {
     const path = join(dir, name);
-    if (statSync(path).isDirectory()) out.push(...allFilesUnder(path, base));
+    if (excludeArtifacts && isPackArtifact(relative(base, path))) continue;
+    if (statSync(path).isDirectory()) out.push(...allFilesUnder(path, base, excludeArtifacts));
     else out.push(relative(base, path));
   }
   return out;