cli: switch to external environment management

Currently can only be able to be run by nix, but the plan is to create a
docker container for non-nix users.

Can run the cli using:

nix run . -- pawtograder /path/to/submission -s /path/to/solution

Author: ironm00n

flake.nix

@@ -23,6 +23,23 @@
 
       formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
 
+      apps = eachSystem (
+        pkgs:
+        let
+          packages = self.packages.${pkgs.system};
+        in
+        {
+          default = {
+            type = "app";
+            program = "${packages.cli}/bin/cli";
+          };
+          pawtograder-pyret = {
+            type = "app";
+            program = "${packages.pawtograder-exec}/bin/pyret-pawtograder";
+          };
+        }
+      );
+
       checks = eachSystem (pkgs: {
 
       });

nix/packages/cli/default.nix

@@ -0,0 +1,48 @@
+{
+  stdenv,
+  lib,
+  nodejs-slim-stripped,
+  makeWrapper,
+  pyret-autograder-prepared,
+  nodejs,
+  pnpm,
+  pawtograder-exec,
+  ...
+}:
+stdenv.mkDerivation (finalAttrs: {
+  name = "pyret-autograder-cli";
+
+  src = pyret-autograder-prepared;
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm
+    makeWrapper
+  ];
+
+  buildPhase = ''
+    set -eu
+    pushd pkgs/cli
+    pnpm run build
+    popd
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    set -eu
+    mkdir -p $out/bin
+
+    cp -r pkgs/cli/dist $out/
+    cp pkgs/cli/package.json $out/
+    cp -rL pkgs/cli/node_modules $out/
+    cp ${pawtograder-exec}/bin/pyret-pawtograder $out/bin
+
+    makeWrapper ${lib.getExe nodejs-slim-stripped} $out/bin/cli \
+      --add-flags "--enable-source-maps" \
+      --add-flags "$out/dist/index.js" \
+      --set PAWTOGRADER_PYRET_PATH "$out/bin/pyret-pawtograder"
+
+    runHook postInstall
+  '';
+})

nix/packages/default.nix

@@ -17,6 +17,7 @@ let
     pyret-autograder-prepared = callPackage ./pyret-autograder-prepared/default.nix { };
     pawtograder-exec = callPackage ./pawtograder-exec/default.nix { };
     scc = callPackage ./scc/default.nix { };
+    cli = callPackage ./cli/default.nix { };
   };
 in
 packages

nix/packages/pawtograder-exec/default.nix

@@ -6,8 +6,6 @@
   compiled-builtins,
   makeWrapper,
   callPackage,
-  nodejs,
-  pnpm,
   ...
 }:
 let

nix/packages/pyret-autograder-prepared/default.nix

@@ -3,6 +3,7 @@
   nodejs,
   pnpm,
   pyret-autograder-src,
+  lib,
   ...
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -21,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
       inherit (finalAttrs) src;
       fetcherVersion = 2;
       # hash = lib.fakeHash;
-      hash = "sha256-MkD1/VpdvcIhIv9XxG05IA6DLwUVqAkFzGpGzyT8YDE=";
+      hash = "sha256-0imd3gMgbWmaqW1DHa5Ne/x0eQhQMi+qo4pL9Jx+xpQ=";
     }).overrideAttrs
       (old: {
         # HACK: we really shouldn't be doing this! but its tricky to update the lockfile for the overrides

pkgs/cli/.swcrc

@@ -1,4 +1,4 @@
-
+{
   "$schema": "https://swc.rs/schema.json",
   "jsc": {
     "parser": {

pkgs/cli/bin/pawtograder.ts

@@ -17,48 +17,15 @@
   with pyret-autograder-cli. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import yaml from "yaml";
-import { readFile, mkdtemp } from "node:fs/promises";
+import chalk from "chalk";
 import { spawn } from "node:child_process";
+import { mkdtemp } from "node:fs/promises";
 import path from "node:path";
-import { Config, Spec, z } from "pyret-autograder-pawtograder";
-import chalk from "chalk";
 import os from "os";
 
-const PKG_ROOT = path.resolve(import.meta.dirname, "..");
-const DEFAULT_COMPILED_PATH =
-  path.join(PKG_ROOT, "build/pyret/lib-compiled") +
-  ":" +
-  path.join(PKG_ROOT, "build/pyret/cpo-compiled");
-
-async function resolveSpec(submissionPath: string, solutionPath: string) {
-  const rawConfig = await readFile(
-    path.join(solutionPath, "pawtograder.yml"),
-    "utf8",
-  );
-
-  const config: Config = yaml.parse(rawConfig, { merge: true });
-
-  console.dir(config, { depth: 3 });
-
-  const parseRes = Spec.safeParse({
-    solution_dir: solutionPath,
-    submission_dir: submissionPath,
-    config,
-  });
-
-  if (parseRes.success) {
-    return parseRes.data;
-  } else {
-    const pretty = z.prettifyError(parseRes.error);
-    const err =
-      chalk.redBright.bold`Invalid specification provided` +
-      `:\n${chalk.yellow(pretty)}\n\n` +
-      chalk.bold`See the ` +
-      chalk.blackBright.bold`cause` +
-      chalk.bold` field for the full error.`;
-
-    throw new Error(err, { cause: parseRes.error });
+class InnerError extends Error {
+  constructor(message: string) {
+    super(message);
   }
 }
 
@@ -68,7 +35,6 @@ export async function pawtograderAction(
 ) {
   const submissionPath = path.resolve(submission);
   const solutionPath = path.resolve(solution);
-  const spec = await resolveSpec(submissionPath, solutionPath);
 
   console.log(
     `Grading submission at ${submissionPath} with the specification located in ${solutionPath}`,
@@ -81,29 +47,26 @@ export async function pawtograderAction(
   })();
   const result = await new Promise((resolve, reject) => {
     const env = {
-      PA_PYRET_LANG_COMPILED_PATH: DEFAULT_COMPILED_PATH,
       PA_CURRENT_LOAD_PATH: submissionPath,
       PA_ARTIFACT_DIR: artifactDir,
       ...process.env,
       PWD: submissionPath,
     };
 
     const child = spawn(
-      process.execPath,
-      [path.join(import.meta.dirname, "../src/pawtograder.cjs")],
+      process.env.PAWTOGRADER_PYRET_PATH ?? "pyret-pawtograder",
+      [solutionPath, submissionPath],
       {
         env,
         cwd: submissionPath,
         //     [ stdin, stdout, stderr, custom]
-        stdio: ["pipe", "pipe", "pipe", "pipe"],
+        stdio: ["ignore", "pipe", "pipe", "pipe"],
       },
     );
 
-    console.log("grader started");
-
     for (const [stream, target, name] of [
-      [child.stdout, process.stdout, chalk.blue`stdout`],
-      [child.stderr, process.stderr, chalk.red`stderr`],
+      [child.stdout!, process.stdout, chalk.blue`stdout`],
+      [child.stderr!, process.stderr, chalk.red`stderr`],
     ] as const) {
       const prefix = `${name} » `;
       let leftover = "";
@@ -125,18 +88,22 @@ export async function pawtograderAction(
 
     child.on("close", (code) => {
       console.log("grader ended");
-      if (code !== 0) {
+      if (code === 0) {
+        try {
+          resolve(JSON.parse(output));
+        } catch (e) {
+          reject(new Error(`Invalid JSON from grader: ${output}\n${e}`));
+        }
+      } else if (code === 1) {
+        try {
+          reject(new InnerError(JSON.parse(output)));
+        } catch (e) {
+          reject(new Error(`Invalid JSON from grader: ${output}\n${e}`));
+        }
+      } else {
         return reject(new Error(`Grader failed with code ${code}.`));
       }
-      try {
-        resolve(JSON.parse(output));
-      } catch (e) {
-        reject(new Error(`Invalid JSON from grader: ${output}\n${e}`));
-      }
     });
-
-    child.stdin.write(JSON.stringify(spec));
-    child.stdin.end();
   });
 
   console.dir(result);

pkgs/cli/package.json

@@ -14,34 +14,17 @@
     "pyret-autograder-cli": "dist/index.js"
   },
   "scripts": {
-    "build": "pnpm run build_typescript && npm run build_pawtograder",
+    "build": "swc bin -d dist --strip-leading-paths",
     "build_typescript": "swc bin -d dist --strip-leading-paths",
-    "build_pawtograder": "pnpm run build_pawtograder:prepare && pnpm run build_pawtograder:pyret",
-    "build_pawtograder:prepare": "./scripts/prepare.sh",
-    "build_pawtograder:pyret": "./scripts/compile-pawtograder.sh",
     "prepack": "pnpm run build"
   },
   "dependencies": {
     "chalk": "^5.4.1",
-    "commander": "^14.0.0",
-    "pyret-autograder": "workspace:^",
-    "pyret-autograder-pawtograder": "workspace:^",
-    "yaml": "catalog:",
-    "canvas": "catalog:pyret-runtime",
-    "cross-fetch": "catalog:pyret-runtime",
-    "fast-csv": "catalog:pyret-runtime",
-    "js-md5": "catalog:pyret-runtime",
-    "js-sha256": "catalog:pyret-runtime",
-    "q": "catalog:pyret-runtime",
-    "resolve": "catalog:pyret-runtime",
-    "s-expression": "catalog:pyret-runtime",
-    "seedrandom": "catalog:pyret-runtime",
-    "source-map": "catalog:pyret-runtime",
-    "vega": "catalog:pyret-runtime"
+    "commander": "^14.0.2"
   },
   "devDependencies": {
-    "@types/node": "catalog:",
     "@swc/cli": "catalog:",
-    "@swc/core": "catalog:"
+    "@swc/core": "catalog:",
+    "@types/node": "catalog:"
   }
 }