@astralyn/sash 0.1.1 → 0.1.2

package/dist/core-config-validation.js

@@ -1,9 +1,10 @@
 import { execFile } from "node:child_process";
+import crypto from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { atomicWriteFileSync } from "./fs-atomic.js";
 import { buildSanitizedEnv } from "./process.js";
-function defaultRunner(executable, args) {
+function defaultRunner(executable, args, signal) {
     return new Promise((resolve, reject) => {
         execFile(executable, args, {
             encoding: "utf8",
@@ -11,19 +12,19 @@ function defaultRunner(executable, args) {
             maxBuffer: 1024 * 1024,
             timeout: 20_000,
             windowsHide: true,
-        }, (err, stdout, stderr) => {
-            if (!err) {
+            signal,
+        }, (error, stdout, stderr) => {
+            if (error)
+                reject(Object.assign(error, { stdout, stderr }));
+            else
                 resolve();
-                return;
-            }
-            reject(Object.assign(err, { stdout, stderr }));
         });
     });
 }
-function errorOutput(err) {
-    if (typeof err !== "object" || err === null)
-        return String(err);
-    const record = err;
+function errorOutput(error) {
+    if (typeof error !== "object" || error === null)
+        return String(error);
+    const record = error;
     for (const value of [record.stderr, record.stdout, record.message]) {
         const text = Buffer.isBuffer(value)
             ? value.toString("utf8").trim()
@@ -33,40 +34,23 @@ function errorOutput(err) {
     }
     return "unknown validation error";
 }
-export async function validateCoreConfigFile(executable, configFile, layout, runner = defaultRunner) {
-    if (!fs.existsSync(executable)) {
+export async function validateCoreConfig(executable, yaml, layout, options = {}) {
+    options.signal?.throwIfAborted();
+    if (!fs.existsSync(executable))
         throw new Error(`Core executable is missing: ${executable}`);
-    }
-    if (!fs.existsSync(configFile)) {
-        throw new Error(`Core configuration is missing: ${configFile}`);
-    }
-    try {
-        await runner(executable, ["-t", "-d", layout.root, "-f", configFile]);
-    }
-    catch (err) {
-        throw new Error(`Core rejected generated configuration: ${errorOutput(err)}`);
-    }
-}
-export async function validateCoreConfigTextWithExecutable(executable, yaml, layout, runner = defaultRunner) {
-    if (!fs.existsSync(executable)) {
-        throw new Error(`Core executable is missing: ${executable}`);
-    }
-    fs.mkdirSync(layout.tempDir, { recursive: true });
-    const candidate = path.join(layout.tempDir, `config-validate-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}.yaml`);
+    const candidate = path.join(layout.tempDir, `config-validate-${crypto.randomUUID()}.yaml`);
     try {
         atomicWriteFileSync(candidate, yaml);
-        await validateCoreConfigFile(executable, candidate, layout, runner);
+        await (options.runner ?? defaultRunner)(executable, ["-t", "-d", layout.root, "-f", candidate], options.signal);
+        options.signal?.throwIfAborted();
     }
-    catch (err) {
-        if (err instanceof Error && err.message.startsWith("Core rejected generated configuration:")) {
-            throw err;
-        }
-        throw new Error(`Core rejected generated configuration: ${errorOutput(err)}`);
+    catch (error) {
+        options.signal?.throwIfAborted();
+        throw new Error(`Core rejected generated configuration: ${errorOutput(error)}`, {
+            cause: error,
+        });
     }
     finally {
         fs.rmSync(candidate, { force: true });
     }
 }
-export function validateCoreConfigText(yaml, layout, runner = defaultRunner) {
-    return validateCoreConfigTextWithExecutable(layout.coreExe, yaml, layout, runner);
-}