@hyperscale0/hsx 1.0.341 → 1.0.347

package/src/cli.ts

@@ -1,20 +1,11 @@
-import { existsSync, readFileSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import { headerManifest } from "./headers.ts";
 import { compile } from "./compile.ts";
 import { format } from "./format.ts";
-import { serializeUdl, UDL_FORMAT_VERSION } from "@hyperscale0/udl";
+import { serializeUdl } from "@hyperscale0/udl";
+import { defaultToolchain } from "./toolchain.ts";
 const usage =
   "hsx build|format|cost <file> [--out path]\nhsx check <file>\nhsx headers --json";
-const standardLibrary = {
-  source: (header: string) => {
-    for (const base of ["../std/", "../../std/"]) {
-      const file = new URL(`${base}${header}.hsx`, import.meta.url);
-      if (existsSync(file)) return readFileSync(file, "utf8");
-    }
-    return undefined;
-  },
-};
 
 export interface Io {
   out(line: string): void;
@@ -29,7 +20,7 @@ export async function runCli(argv: readonly string[], io: Io): Promise<number> {
       io.err("usage: hsx headers --json");
       return 2;
     }
-    io.out(JSON.stringify(headerManifest(standardLibrary), null, 2));
+    io.out(JSON.stringify(headerManifest(), null, 2));
     return 0;
   }
   if (["--help", "help", "-h"].includes(command ?? "")) {
@@ -37,18 +28,8 @@ export async function runCli(argv: readonly string[], io: Io): Promise<number> {
     return 0;
   }
   if (command === "--version") {
-    // src/cli.ts in a checkout, dist/src/cli.js in the published package.
-    for (const base of ["../", "../../"]) {
-      const manifest = new URL(`${base}package.json`, import.meta.url);
-      if (!existsSync(manifest)) continue;
-      const { version } = JSON.parse(readFileSync(manifest, "utf8")) as {
-        version: string;
-      };
-      io.out(`${version} (UDL ${UDL_FORMAT_VERSION})`);
-      return 0;
-    }
-    io.err("hsx: package.json not found");
-    return 1;
+    io.out(`${defaultToolchain.hsx} (UDL ${defaultToolchain.udl})`);
+    return 0;
   }
   if (
     !command ||
@@ -84,7 +65,7 @@ export async function runCli(argv: readonly string[], io: Io): Promise<number> {
       }
       text = result.formatted;
     } else {
-      const result = compile(source, { standardLibrary });
+      const result = compile(source, defaultToolchain);
       for (const d of [...result.diagnostics, ...result.warnings])
         io.err(
           `${d.source && d.source !== "program" ? d.source : file}:${d.line}:${d.column}: ${d.severity === "warning" ? "warning " : ""}${d.code} ${d.message.replace(/[^.?!]$/, "$&.")} ${d.fix}`,