@vforsh/argus 0.1.14 → 0.1.16

package/dist/commands/eval.js

@@ -1,29 +1,16 @@
 import { evalWithRetries } from '../eval/evalClient.js';
 import { createOutput } from '../output/io.js';
 import { resolveWatcherOrExit } from '../watchers/requestWatcher.js';
-import { formatError, hasEvalArgs, parseCount, parseEvalArgs, parseIntervalMs, parseNumber, parseRetryCount, printError, printSuccess, resolveExpression, sleep, wrapExpressionWithArgs, wrapForIframeEval, } from './evalShared.js';
+import { pollEval } from './evalPolling.js';
+import { formatError, parseCount, parseIntervalMs, parseNumber, parseRetryCount, prepareEvalExpression, printError, printSuccess, } from './evalShared.js';
 /** Execute the eval command for a watcher id. */
 export const runEval = async (id, rawExpression, options) => {
     const output = createOutput(options);
-    const evalArgs = parseEvalArgs(options.arg);
-    if (evalArgs.error) {
-        output.writeWarn(evalArgs.error);
+    const prepared = await prepareEvalExpression(rawExpression, options, output);
+    if (prepared == null) {
         process.exitCode = 2;
         return;
     }
-    const resolvedExpression = await resolveExpression(rawExpression, options, output);
-    if (resolvedExpression == null) {
-        process.exitCode = 2;
-        return;
-    }
-    const requestArgs = !options.iframe && hasEvalArgs(evalArgs.value) ? evalArgs.value : undefined;
-    const expression = options.iframe
-        ? wrapForIframeEval(wrapExpressionWithArgs(resolvedExpression, evalArgs.value), {
-            selector: options.iframe,
-            namespace: options.iframeNamespace ?? 'argus',
-            timeoutMs: parseNumber(options.iframeTimeout) ?? 5000,
-        })
-        : resolvedExpression;
     const retryCount = parseRetryCount(options.retry);
     if (retryCount.error) {
         output.writeWarn(retryCount.error);
@@ -66,8 +53,8 @@ export const runEval = async (id, rawExpression, options) => {
     if (intervalMs.value == null) {
         const singleResult = await evalWithRetries({
             watcher,
-            expression,
-            args: requestArgs,
+            expression: prepared.expression,
+            args: prepared.args,
             awaitPromise: options.await ?? true,
             returnByValue: options.returnByValue ?? true,
             timeoutMs,
@@ -82,51 +69,45 @@ export const runEval = async (id, rawExpression, options) => {
         printSuccess(singleResult.response, options, output, false);
         return;
     }
-    let running = true;
-    const stop = () => {
-        running = false;
-    };
-    process.on('SIGINT', stop);
-    process.on('SIGTERM', stop);
-    let iteration = 0;
-    while (running) {
-        iteration += 1;
-        const iterationResult = await evalWithRetries({
-            watcher,
-            expression,
-            args: requestArgs,
-            awaitPromise: options.await ?? true,
-            returnByValue: options.returnByValue ?? true,
-            timeoutMs,
-            failOnException: options.failOnException ?? true,
-            retryCount: retryCount.value,
-        });
-        if (!iterationResult.ok) {
-            printError(iterationResult, options, output);
-            process.exitCode = 1;
-            return;
-        }
-        printSuccess(iterationResult.response, options, output, true);
-        if (untilEvaluator.evaluator) {
+    const pollResult = await pollEval({
+        watcher,
+        expression: prepared.expression,
+        args: prepared.args,
+        awaitPromise: options.await ?? true,
+        returnByValue: options.returnByValue ?? true,
+        timeoutMs,
+        failOnException: options.failOnException ?? true,
+        retryCount: retryCount.value,
+        intervalMs: intervalMs.value,
+        count: countValue.value,
+        onResult: (response) => {
+            printSuccess(response, options, output, true);
+        },
+        shouldStop: (context) => {
+            if (!untilEvaluator.evaluator) {
+                return { ok: true, matched: false };
+            }
             const untilResult = untilEvaluator.evaluator({
-                result: iterationResult.response.result,
-                exception: iterationResult.response.exception ?? null,
-                iteration,
-                attempt: iterationResult.attempt,
+                result: context.response.result,
+                exception: context.response.exception ?? null,
+                iteration: context.iteration,
+                attempt: context.attempt,
             });
-            if (!untilResult.ok) {
-                printError({ kind: 'until', error: untilResult.error }, options, output);
-                process.exitCode = 1;
-                return;
-            }
-            if (untilResult.matched) {
-                return;
-            }
-        }
-        if (countValue.value != null && iteration >= countValue.value) {
-            return;
-        }
-        await sleep(intervalMs.value);
+            return untilResult.ok ? { ok: true, matched: untilResult.matched } : { ok: false, error: untilResult.error };
+        },
+    });
+    if (pollResult.kind === 'eval-error') {
+        printError(pollResult.failure, options, output);
+        process.exitCode = 1;
+        return;
+    }
+    if (pollResult.kind === 'condition-error') {
+        printError({ kind: 'until', error: pollResult.error }, options, output);
+        process.exitCode = 1;
+        return;
+    }
+    if (pollResult.kind === 'interrupted') {
+        process.exitCode = 130;
     }
 };
 const compileUntil = (condition) => {

package/dist/commands/eval.js.map

@@ -1 +1 @@
-{"version":3,"file":"eval.js","sourceRoot":"","sources":["../../src/commands/eval.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"eval.js","sourceRoot":"","sources":["../../src/commands/eval.ts"],"names":[],"mappings":"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"}

package/dist/commands/evalBundle.d.ts

@@ -0,0 +1,17 @@
+export type BundleEvalEntryResult = {
+    ok: true;
+    code: string;
+} | {
+    ok: false;
+    error: string;
+};
+/**
+ * Bundle a local `--file` entry and its relative imports into one browser-evaluable script.
+ *
+ * - Only files under the entry file's directory are allowed (no package or Node imports).
+ * - TypeScript is transpiled without typechecking.
+ * - Output is REPL-compatible: one script, no top-level `export`.
+ * - Static and dynamic `import()` of local files are inlined into one script.
+ */
+export declare const bundleEvalEntry: (entryPath: string) => Promise<BundleEvalEntryResult>;
+//# sourceMappingURL=evalBundle.d.ts.map

package/dist/commands/evalBundle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"evalBundle.d.ts","sourceRoot":"","sources":["../../src/commands/evalBundle.ts"],"names":[],"mappings":"AAIA,MAAM,MAAM,qBAAqB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAW7F;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAAU,WAAW,MAAM,KAAG,OAAO,CAAC,qBAAqB,CAoCtF,CAAA"}

package/dist/commands/evalBundle.js

@@ -0,0 +1,119 @@
+import { realpath } from 'node:fs/promises';
+import path from 'node:path';
+let esbuildModulePromise;
+const nodeModulesSegment = `${path.sep}node_modules${path.sep}`;
+/** Load esbuild on demand so non-eval CLI commands avoid the native binary startup cost. */
+const loadEsbuild = () => (esbuildModulePromise ??= import('esbuild'));
+/**
+ * Bundle a local `--file` entry and its relative imports into one browser-evaluable script.
+ *
+ * - Only files under the entry file's directory are allowed (no package or Node imports).
+ * - TypeScript is transpiled without typechecking.
+ * - Output is REPL-compatible: one script, no top-level `export`.
+ * - Static and dynamic `import()` of local files are inlined into one script.
+ */
+export const bundleEvalEntry = async (entryPath) => {
+    let entryPoint;
+    try {
+        entryPoint = await realpath(path.resolve(entryPath));
+    }
+    catch {
+        return { ok: false, error: `Failed to read entry file: ${entryPath}` };
+    }
+    const bundleRoot = path.dirname(entryPoint);
+    try {
+        const esbuild = await loadEsbuild();
+        const result = await esbuild.build({
+            absWorkingDir: bundleRoot,
+            entryPoints: [entryPoint],
+            bundle: true,
+            write: false,
+            splitting: false,
+            format: 'esm',
+            platform: 'browser',
+            target: 'es2022',
+            sourcemap: false,
+            logLevel: 'silent',
+            plugins: [createLocalFilesPlugin(bundleRoot)],
+        });
+        const output = result.outputFiles[0];
+        if (output == null) {
+            return { ok: false, error: 'Bundle produced no output.' };
+        }
+        const code = `${output.text.trimEnd()}\n//# sourceURL=argus-file://${entryPoint}\n`;
+        return { ok: true, code };
+    }
+    catch (error) {
+        return { ok: false, error: formatBundleFailure(error) };
+    }
+};
+/** Restrict imports to the entry directory and ensure the bundle is REPL-safe. */
+const createLocalFilesPlugin = (bundleRoot) => {
+    const bundleRootPrefix = bundleRoot.endsWith(path.sep) ? bundleRoot : `${bundleRoot}${path.sep}`;
+    return {
+        name: 'argus-eval-bundle',
+        setup(build) {
+            build.onResolve({ filter: /.*/ }, (args) => {
+                if (args.kind === 'entry-point') {
+                    return undefined;
+                }
+                if (args.path.startsWith('node:')) {
+                    return bundleError(`Node built-in import ${JSON.stringify(args.path)} is not allowed in page eval.`);
+                }
+                if (!args.path.startsWith('.') && !path.isAbsolute(args.path)) {
+                    return bundleError(`Import ${JSON.stringify(args.path)} is not allowed. Use relative local files under ${bundleRoot}.`);
+                }
+                return undefined;
+            });
+            build.onLoad({ filter: /.*/ }, async (args) => {
+                let resolvedPath;
+                try {
+                    resolvedPath = await realpath(args.path);
+                }
+                catch {
+                    return bundleError(`Failed to read file: ${args.path}`);
+                }
+                if (resolvedPath !== bundleRoot && !resolvedPath.startsWith(bundleRootPrefix)) {
+                    return bundleError(`Import escapes the entry directory: ${args.path}`);
+                }
+                if (resolvedPath.includes(nodeModulesSegment)) {
+                    return bundleError(`Import from node_modules is not allowed: ${args.path}`);
+                }
+                return undefined;
+            });
+            build.onEnd((result) => {
+                if (result.errors.length > 0) {
+                    return;
+                }
+                const outputs = result.outputFiles ?? [];
+                if (outputs.length !== 1) {
+                    return bundleError(`Bundle produced ${outputs.length} outputs; expected exactly one script.`);
+                }
+                if (/\bexport\b/.test(outputs[0]?.text ?? '')) {
+                    return bundleError('Bundled script contains top-level export statements, which page eval cannot run. ' +
+                        'Remove exports from the entry file (helpers may still export symbols for import).');
+                }
+            });
+        },
+    };
+};
+const bundleError = (text) => ({ errors: [{ text }] });
+const formatBundleFailure = (error) => {
+    if (isEsbuildFailure(error)) {
+        return error.errors.map(formatEsbuildMessage).join('\n');
+    }
+    return error instanceof Error ? error.message : String(error);
+};
+const isEsbuildFailure = (error) => error instanceof Error && 'errors' in error && Array.isArray(error.errors) && error.errors.length > 0;
+const formatEsbuildMessage = (issue) => {
+    const message = issue.text || 'Bundle failed.';
+    const { file, line, column } = issue.location ?? {};
+    if (!file) {
+        return message;
+    }
+    if (line == null || column == null) {
+        return `${file}: ${message}`;
+    }
+    return `${file}:${line}:${column}: ${message}`;
+};
+//# sourceMappingURL=evalBundle.js.map

package/dist/commands/evalBundle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"evalBundle.js","sourceRoot":"","sources":["../../src/commands/evalBundle.ts"],"names":[],"mappings":"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"}

package/dist/commands/evalPolling.d.ts

@@ -0,0 +1,55 @@
+import type { EvalResponse, WatcherRecord } from '@vforsh/argus-core';
+import { type EvalAttemptResult } from '../eval/evalClient.js';
+type PollStopContext = {
+    response: EvalResponse;
+    iteration: number;
+    attempt: number;
+};
+type PollStopResult = {
+    ok: true;
+    matched: boolean;
+} | {
+    ok: false;
+    error: string;
+};
+export type EvalPollInput = {
+    watcher: Pick<WatcherRecord, 'id' | 'host' | 'port'>;
+    expression: string;
+    args?: Record<string, string>;
+    awaitPromise: boolean;
+    returnByValue: boolean;
+    timeoutMs?: number;
+    failOnException: boolean;
+    retryCount: number;
+    intervalMs: number;
+    count?: number;
+    totalTimeoutMs?: number;
+    shouldStop?: (context: PollStopContext) => PollStopResult;
+    onResult?: (response: EvalResponse, context: PollStopContext) => void;
+};
+export type EvalPollOutcome = {
+    kind: 'matched';
+    response: EvalResponse;
+    iteration: number;
+    attempt: number;
+} | {
+    kind: 'exhausted';
+    iterations: number;
+} | {
+    kind: 'timeout';
+    elapsedMs: number;
+} | {
+    kind: 'interrupted';
+} | {
+    kind: 'eval-error';
+    failure: Extract<EvalAttemptResult, {
+        ok: false;
+    }>;
+} | {
+    kind: 'condition-error';
+    error: string;
+};
+/** Shared polling engine for `eval --interval` and `eval-until` so loop semantics stay identical. */
+export declare const pollEval: (input: EvalPollInput) => Promise<EvalPollOutcome>;
+export {};
+//# sourceMappingURL=evalPolling.d.ts.map

package/dist/commands/evalPolling.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"evalPolling.d.ts","sourceRoot":"","sources":["../../src/commands/evalPolling.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACrE,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAG/E,KAAK,eAAe,GAAG;IACtB,QAAQ,EAAE,YAAY,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;CACf,CAAA;AAED,KAAK,cAAc,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAEnF,MAAM,MAAM,aAAa,GAAG;IAC3B,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,GAAG,MAAM,GAAG,MAAM,CAAC,CAAA;IACpD,UAAU,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,YAAY,EAAE,OAAO,CAAA;IACrB,aAAa,EAAE,OAAO,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,OAAO,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,cAAc,CAAA;IACzD,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,eAAe,KAAK,IAAI,CAAA;CACrE,CAAA;AAED,MAAM,MAAM,eAAe,GACxB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,YAAY,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC/E;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACtC;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC,iBAAiB,EAAE;QAAE,EAAE,EAAE,KAAK,CAAA;KAAE,CAAC,CAAA;CAAE,GAC1E;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAE7C,qGAAqG;AACrG,eAAO,MAAM,QAAQ,GAAU,OAAO,aAAa,KAAG,OAAO,CAAC,eAAe,CA+D5E,CAAA"}

package/dist/commands/evalPolling.js

@@ -0,0 +1,59 @@
+import { evalWithRetries } from '../eval/evalClient.js';
+import { sleep } from './evalShared.js';
+/** Shared polling engine for `eval --interval` and `eval-until` so loop semantics stay identical. */
+export const pollEval = async (input) => {
+    let running = true;
+    const stop = () => {
+        running = false;
+    };
+    process.on('SIGINT', stop);
+    process.on('SIGTERM', stop);
+    try {
+        const startTime = Date.now();
+        let iteration = 0;
+        while (running) {
+            if (input.totalTimeoutMs != null) {
+                const elapsed = Date.now() - startTime;
+                if (elapsed >= input.totalTimeoutMs) {
+                    return { kind: 'timeout', elapsedMs: elapsed };
+                }
+            }
+            iteration += 1;
+            const result = await evalWithRetries({
+                watcher: input.watcher,
+                expression: input.expression,
+                args: input.args,
+                awaitPromise: input.awaitPromise,
+                returnByValue: input.returnByValue,
+                timeoutMs: input.timeoutMs,
+                failOnException: input.failOnException,
+                retryCount: input.retryCount,
+            });
+            if (!result.ok) {
+                return { kind: 'eval-error', failure: result };
+            }
+            const context = { response: result.response, iteration, attempt: result.attempt };
+            // Streaming commands print the matched iteration too, so emit before checking stop conditions.
+            input.onResult?.(result.response, context);
+            const stopResult = input.shouldStop?.(context);
+            if (stopResult) {
+                if (!stopResult.ok) {
+                    return { kind: 'condition-error', error: stopResult.error };
+                }
+                if (stopResult.matched) {
+                    return { kind: 'matched', response: result.response, iteration, attempt: result.attempt };
+                }
+            }
+            if (input.count != null && iteration >= input.count) {
+                return { kind: 'exhausted', iterations: iteration };
+            }
+            await sleep(input.intervalMs);
+        }
+        return { kind: 'interrupted' };
+    }
+    finally {
+        process.off('SIGINT', stop);
+        process.off('SIGTERM', stop);
+    }
+};
+//# sourceMappingURL=evalPolling.js.map

package/dist/commands/evalPolling.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"evalPolling.js","sourceRoot":"","sources":["../../src/commands/evalPolling.ts"],"names":[],"mappings":"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"}

package/dist/commands/evalShared.d.ts

@@ -4,9 +4,23 @@ export { formatError, parseNumber } from '../cli/parse.js';
 type ExpressionSourceOptions = {
     file?: string;
     stdin?: boolean;
+    inject?: string;
+    bundle?: boolean;
 };
 /** String-only argument map exposed to eval scripts as `args`. */
 export type EvalArgMap = Record<string, string>;
+type EvalExpressionOptions = ExpressionSourceOptions & {
+    iframe?: string;
+    iframeNamespace?: string;
+    iframeTimeout?: string;
+    arg?: string[];
+};
+export type PreparedEvalExpression = {
+    expression: string;
+    args?: EvalArgMap;
+};
+/** Resolve script input, eval args, and iframe wrapping into the payload sent to the watcher. */
+export declare const prepareEvalExpression: (inline: string | undefined, options: EvalExpressionOptions, output: Output) => Promise<PreparedEvalExpression | null>;
 /**
  * Resolve the JS expression from inline argument, --file, or --stdin.
  * Returns `null` (and writes a warning) when the input is invalid.

package/dist/commands/evalShared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evalShared.d.ts","sourceRoot":"","sources":["../../src/commands/evalShared.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evalShared.d.ts","sourceRoot":"","sources":["../../src/commands/evalShared.ts"],"names":[],"mappings":"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"}

package/dist/commands/evalShared.js

@@ -2,8 +2,35 @@ import { previewStringify } from '@vforsh/argus-core';
 import { readFile } from 'node:fs/promises';
 import { formatError, parseNumber } from '../cli/parse.js';
 import { parseDurationMs } from '../time.js';
+import { bundleEvalEntry } from './evalBundle.js';
 // Re-export shared parsers so existing eval imports keep working
 export { formatError, parseNumber } from '../cli/parse.js';
+/** Resolve script input, eval args, and iframe wrapping into the payload sent to the watcher. */
+export const prepareEvalExpression = async (inline, options, output) => {
+    const evalArgs = parseEvalArgs(options.arg);
+    if (evalArgs.error) {
+        output.writeWarn(evalArgs.error);
+        return null;
+    }
+    const resolvedExpression = await resolveExpression(inline, options, output);
+    if (resolvedExpression == null) {
+        return null;
+    }
+    const args = evalArgs.value;
+    if (!options.iframe) {
+        return {
+            expression: resolvedExpression,
+            args: hasEvalArgs(args) ? args : undefined,
+        };
+    }
+    return {
+        expression: wrapForIframeEval(wrapExpressionWithArgs(resolvedExpression, args), {
+            selector: options.iframe,
+            namespace: options.iframeNamespace ?? 'argus',
+            timeoutMs: parseNumber(options.iframeTimeout) ?? 5000,
+        }),
+    };
+};
 /**
  * Resolve the JS expression from inline argument, --file, or --stdin.
  * Returns `null` (and writes a warning) when the input is invalid.
@@ -11,7 +38,8 @@ export { formatError, parseNumber } from '../cli/parse.js';
 export const resolveExpression = async (inline, options, output) => {
     const wantsStdin = options.stdin === true || inline === '-';
     const hasInline = inline != null && inline !== '-';
-    const hasFile = options.file != null;
+    const filePath = options.file;
+    const hasFile = filePath != null;
     if (hasInline && hasFile) {
         output.writeWarn('Cannot combine an inline expression with --file');
         return null;
@@ -24,43 +52,80 @@ export const resolveExpression = async (inline, options, output) => {
         output.writeWarn('Cannot combine --file with stdin input');
         return null;
     }
-    if (hasFile) {
+    if (options.bundle && !hasFile) {
+        output.writeWarn('--bundle requires --file');
+        return null;
+    }
+    let expression;
+    if (hasFile && options.bundle) {
+        const bundled = await bundleEvalEntry(filePath);
+        if (!bundled.ok) {
+            output.writeWarn(`Failed to bundle --file: ${bundled.error}`);
+            return null;
+        }
+        if (!bundled.code.trim()) {
+            output.writeWarn(`Bundled file is empty: ${options.file}`);
+            return null;
+        }
+        expression = bundled.code;
+    }
+    else if (hasFile) {
         try {
-            const content = await readFile(options.file ?? '', 'utf8');
+            const content = await readFile(filePath, 'utf8');
             if (!content.trim()) {
                 output.writeWarn(`File is empty: ${options.file}`);
                 return null;
             }
-            return content;
+            expression = content;
         }
         catch (error) {
             output.writeWarn(`Failed to read --file: ${formatError(error)}`);
             return null;
         }
     }
-    if (wantsStdin) {
+    else if (wantsStdin) {
         try {
             const content = await readStdin();
             if (!content.trim()) {
                 output.writeWarn('Stdin input is empty');
                 return null;
             }
-            return content;
+            expression = content;
         }
         catch (error) {
             output.writeWarn(`Failed to read stdin: ${formatError(error)}`);
             return null;
         }
     }
-    if (hasInline) {
+    else if (hasInline) {
         if (!inline.trim()) {
             output.writeWarn('Expression is empty');
             return null;
         }
-        return inline;
+        expression = inline;
+    }
+    else {
+        output.writeWarn('Expression is required. Provide an inline expression, --file, or --stdin (or pass - as expression).');
+        return null;
+    }
+    return await prependInjectSource(expression, options.inject, output);
+};
+const prependInjectSource = async (expression, injectPath, output) => {
+    if (injectPath == null) {
+        return expression;
+    }
+    try {
+        const injectSource = await readFile(injectPath, 'utf8');
+        if (!injectSource.trim()) {
+            output.writeWarn(`Inject file is empty: ${injectPath}`);
+            return null;
+        }
+        return `${injectSource}\n${expression}`;
+    }
+    catch (error) {
+        output.writeWarn(`Failed to read --inject: ${formatError(error)}`);
+        return null;
     }
-    output.writeWarn('Expression is required. Provide an inline expression, --file, or --stdin (or pass - as expression).');
-    return null;
 };
 /** Read all of stdin into a string. */
 export const readStdin = async () => new Promise((resolve, reject) => {