specli 0.0.17 → 0.0.19

package/dist/cli/compile.js

@@ -1,4 +1,11 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 import { deriveBinaryName } from "./derive-name.js";
+// Resolve the package root directory (at runtime this file is at dist/cli/compile.js)
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const packageRoot = path.resolve(__dirname, "../..");
 function parseKeyValue(input) {
     const idx = input.indexOf("=");
     if (idx === -1)
@@ -9,6 +16,72 @@ function parseKeyValue(input) {
         throw new Error(`Invalid --define '${input}', missing key`);
     return { key, value };
 }
+/**
+ * Loads the OpenAPI spec from a URL or file path.
+ */
+async function loadSpec(spec) {
+    if (!spec)
+        throw new Error("Missing spec path/URL");
+    if (/^https?:\/\//i.test(spec)) {
+        const res = await fetch(spec);
+        if (!res.ok) {
+            throw new Error(`Failed to fetch spec: ${res.status} ${res.statusText}`);
+        }
+        return await res.text();
+    }
+    return await fs.promises.readFile(spec, "utf-8");
+}
+/**
+ * Reads the package version from package.json.
+ */
+function getPackageVersion() {
+    const packageJsonPath = path.join(packageRoot, "package.json");
+    const content = fs.readFileSync(packageJsonPath, "utf-8");
+    const packageJson = JSON.parse(content);
+    return packageJson.version;
+}
+/**
+ * Generates a temporary entrypoint file with all values hardcoded.
+ * This avoids the Bun macro security restriction in node_modules.
+ */
+function generateEntrypoint(options) {
+    const mainImportPath = path.join(packageRoot, "dist/cli/main.js");
+    // Escape the spec text for embedding as a string literal
+    const escapedSpec = JSON.stringify(options.specText);
+    const escapedName = options.cliName
+        ? JSON.stringify(options.cliName)
+        : "undefined";
+    const escapedServer = options.server
+        ? JSON.stringify(options.server)
+        : "undefined";
+    const escapedServerVars = options.serverVars
+        ? JSON.stringify(options.serverVars)
+        : "undefined";
+    const escapedAuth = options.auth ? JSON.stringify(options.auth) : "undefined";
+    const escapedVersion = JSON.stringify(options.version);
+    return `#!/usr/bin/env bun
+// Auto-generated entrypoint for specli compile
+// This file embeds all configuration at build time
+
+import { main } from ${JSON.stringify(mainImportPath)};
+
+const embeddedSpecText = ${escapedSpec};
+const cliName = ${escapedName};
+const server = ${escapedServer};
+const serverVars = ${escapedServerVars};
+const auth = ${escapedAuth};
+const embeddedVersion = ${escapedVersion};
+
+await main(process.argv, {
+	embeddedSpecText,
+	cliName,
+	server,
+	serverVars: serverVars ? serverVars.split(",") : undefined,
+	auth,
+	version: embeddedVersion,
+});
+`;
+}
 export async function compileCommand(spec, options) {
     // Derive name from spec if not provided
     const name = options.name ?? (await deriveBinaryName(spec));
@@ -16,64 +89,74 @@ export async function compileCommand(spec, options) {
     const target = options.target
         ? options.target
         : `bun-${process.platform}-${process.arch}`;
-    // Parse --define pairs
-    const define = {};
-    if (options.define) {
-        for (const pair of options.define) {
-            const { key, value } = parseKeyValue(pair);
-            define[key] = JSON.stringify(value);
+    // Load the spec content
+    process.stdout.write(`Loading spec: ${spec}\n`);
+    const specText = await loadSpec(spec);
+    // Get package version
+    const version = getPackageVersion();
+    // Generate temporary entrypoint file
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "specli-"));
+    const tempEntrypoint = path.join(tempDir, "entrypoint.ts");
+    const entrypointCode = generateEntrypoint({
+        specText,
+        cliName: name,
+        server: options.server,
+        serverVars: options.serverVar?.join(","),
+        auth: options.auth,
+        version,
+    });
+    fs.writeFileSync(tempEntrypoint, entrypointCode);
+    try {
+        // Parse --define pairs
+        const define = {};
+        if (options.define) {
+            for (const pair of options.define) {
+                const { key, value } = parseKeyValue(pair);
+                define[key] = JSON.stringify(value);
+            }
         }
+        // Build command args
+        const buildArgs = [
+            "build",
+            "--compile",
+            `--outfile=${outfile}`,
+            `--target=${target}`,
+        ];
+        if (options.minify)
+            buildArgs.push("--minify");
+        if (options.bytecode)
+            buildArgs.push("--bytecode");
+        for (const [k, v] of Object.entries(define)) {
+            buildArgs.push("--define", `${k}=${v}`);
+        }
+        if (options.dotenv === false)
+            buildArgs.push("--no-compile-autoload-dotenv");
+        if (options.bunfig === false)
+            buildArgs.push("--no-compile-autoload-bunfig");
+        buildArgs.push(tempEntrypoint);
+        const proc = Bun.spawn({
+            cmd: ["bun", ...buildArgs],
+            stdout: "pipe",
+            stderr: "pipe",
+            env: process.env,
+        });
+        const output = await new Response(proc.stdout).text();
+        const error = await new Response(proc.stderr).text();
+        const code = await proc.exited;
+        if (output)
+            process.stdout.write(output);
+        if (error)
+            process.stderr.write(error);
+        if (code !== 0) {
+            process.exitCode = code;
+            return;
+        }
+        process.stdout.write(`ok: built ${outfile}\n`);
+        process.stdout.write(`target: ${target}\n`);
+        process.stdout.write(`name: ${name}\n`);
     }
-    // Build command args
-    const buildArgs = [
-        "build",
-        "--compile",
-        `--outfile=${outfile}`,
-        `--target=${target}`,
-    ];
-    if (options.minify)
-        buildArgs.push("--minify");
-    if (options.bytecode)
-        buildArgs.push("--bytecode");
-    for (const [k, v] of Object.entries(define)) {
-        buildArgs.push("--define", `${k}=${v}`);
-    }
-    if (options.dotenv === false)
-        buildArgs.push("--no-compile-autoload-dotenv");
-    if (options.bunfig === false)
-        buildArgs.push("--no-compile-autoload-bunfig");
-    buildArgs.push("./src/compiled.ts");
-    // Only set env vars that have actual values - avoid empty strings
-    // because the macros will embed them and they will override defaults.
-    const buildEnv = {
-        ...process.env,
-        SPECLI_SPEC: spec,
-        SPECLI_NAME: name,
-    };
-    if (options.server)
-        buildEnv.SPECLI_SERVER = options.server;
-    if (options.serverVar?.length)
-        buildEnv.SPECLI_SERVER_VARS = options.serverVar.join(",");
-    if (options.auth)
-        buildEnv.SPECLI_AUTH = options.auth;
-    const proc = Bun.spawn({
-        cmd: ["bun", ...buildArgs],
-        stdout: "pipe",
-        stderr: "pipe",
-        env: buildEnv,
-    });
-    const output = await new Response(proc.stdout).text();
-    const error = await new Response(proc.stderr).text();
-    const code = await proc.exited;
-    if (output)
-        process.stdout.write(output);
-    if (error)
-        process.stderr.write(error);
-    if (code !== 0) {
-        process.exitCode = code;
-        return;
+    finally {
+        // Clean up temporary files
+        fs.rmSync(tempDir, { recursive: true, force: true });
     }
-    process.stdout.write(`ok: built ${outfile}\n`);
-    process.stdout.write(`target: ${target}\n`);
-    process.stdout.write(`name: ${name}\n`);
 }

package/dist/cli.d.ts

@@ -1,2 +1 @@
-#!/usr/bin/env node
 export {};

package/dist/cli.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "specli",
-	"version": "0.0.17",
+	"version": "0.0.19",
 	"type": "module",
 	"module": "./dist/index.js",
 	"types": "./dist/index.d.ts",