@better-sol/cli 0.1.0-alpha.1 → 0.1.0-alpha.5

package/README.md

@@ -1,5 +1,9 @@
 # @better-sol/cli
 
+> **Alpha**
+>
+> Better Sol is in early development. APIs may change, rough edges exist, and things can break. Your feedback shapes what comes next. Thank you for being an early adopter.
+
 The Better Sol command-line tool. Scaffold programs, compile and deploy to Solana, generate database schemas, and import external programs.
 
 No installation needed. Run with `npx` or `bunx`.
@@ -11,7 +15,7 @@ No installation needed. Run with `npx` or `bunx`.
 Set up a new project.
 
 ```bash
-npx @better-sol/cli init
+npx @better-sol/cli@alpha init
 ```
 
 Creates a payer keypair at `keypair.json`, a `programs/` directory, and a `.gitignore`. Detects your existing Solana CLI keypair at `~/.config/solana/id.json` if you have one. Offers to install `better-sol` if a `package.json` exists.
@@ -26,7 +30,7 @@ Creates a payer keypair at `keypair.json`, a `programs/` directory, and a `.giti
 Scaffold a new program.
 
 ```bash
-npx @better-sol/cli create counter
+npx @better-sol/cli@alpha create counter
 ```
 
 Generates `programs/counter.ts` with a working counter template and `.better-sol/counter.json` with the program keypair.
@@ -41,7 +45,7 @@ Generates `programs/counter.ts` with a working counter template and `.better-sol
 Compile and deploy to Solana.
 
 ```bash
-npx @better-sol/cli deploy
+npx @better-sol/cli@alpha deploy
 ```
 
 Parses your TypeScript, generates Anchor Rust, compiles it via the cloud API, and deploys the binary. On devnet and testnet, automatically funds your payer if the balance is low.
@@ -62,10 +66,10 @@ Import an external program from an on-chain address or a local IDL file.
 
 ```bash
 # From an on-chain program
-npx @better-sol/cli generate idl 12b3t1cNiAUoYLiWFEnFa4w6qYxVAiqCWU7KZuzLPYtH
+npx @better-sol/cli@alpha generate idl 12b3t1cNiAUoYLiWFEnFa4w6qYxVAiqCWU7KZuzLPYtH
 
 # From a local IDL JSON file
-npx @better-sol/cli generate idl ./staking-idl.json
+npx @better-sol/cli@alpha generate idl ./staking-idl.json
 ```
 
 Produces a typed `.ts` file in `generated/`. Detects whether the argument is an address or a file path automatically.
@@ -81,7 +85,7 @@ Produces a typed `.ts` file in `generated/`. Detects whether the argument is an
 Generate a Drizzle ORM schema from your account definitions.
 
 ```bash
-npx @better-sol/cli generate db
+npx @better-sol/cli@alpha generate db
 ```
 
 | Flag | Default | Description |
@@ -95,7 +99,7 @@ npx @better-sol/cli generate db
 Save your compiler API key.
 
 ```bash
-npx @better-sol/cli login
+npx @better-sol/cli@alpha login
 ```
 
 Saves your key to `.better-sol/auth.json`. Without a key you get 5 compiles per hour. With a key, 100 per hour.
@@ -105,7 +109,7 @@ Saves your key to `.better-sol/auth.json`. Without a key you get 5 compiles per
 Submit a deployed program for OtterSec verified-builds.
 
 ```bash
-npx @better-sol/cli verify counter --program-id <address>
+npx @better-sol/cli@alpha verify counter --program-id <address>
 ```
 
 | Flag | Description |

package/dist/index.js

@@ -2,13 +2,13 @@
 import { createRequire } from "node:module";
 import { cancel, confirm, intro, isCancel, log, outro, select, spinner, text } from "@clack/prompts";
 import { Command } from "commander";
-import { fileURLToPath, pathToFileURL } from "node:url";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import path, { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { homedir } from "node:os";
 import { execSync } from "node:child_process";
 import { generateKeyPairSigner, getAddressDecoder } from "@solana/kit";
 import { access, mkdir, opendir, readFile, writeFile } from "node:fs/promises";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import { parseSync } from "oxc-parser";
 import { AnchorProvider, Program } from "@coral-xyz/anchor";
 import crypto$1 from "crypto";
@@ -3036,11 +3036,18 @@ function primitiveLayout(type) {
 //#endregion
 //#region src/parser/discover.ts
 function globToRegex(pattern) {
-	const regexParts = pattern.split("/").map((part) => {
-		if (part === "**") return ".*";
-		return part.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, "[^/]*").replace(/\?/g, "[^/]");
-	});
-	return new RegExp(`^${regexParts.join("/")}$`);
+	const parts = pattern.split("/");
+	const regexParts = [];
+	for (let i = 0; i < parts.length; i++) {
+		const part = parts[i];
+		const isLast = i === parts.length - 1;
+		if (part === "**") regexParts.push("(.*\\/)?");
+		else {
+			regexParts.push(part.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, "[^/]*").replace(/\?/g, "[^/]"));
+			if (!isLast) regexParts.push("/");
+		}
+	}
+	return new RegExp(`^${regexParts.join("")}$`);
 }
 async function findFiles(pattern) {
 	const regex = globToRegex(pattern);
@@ -3098,6 +3105,7 @@ async function discoverProgramsWithSpinner(src) {
 //#region src/commands/deploy.ts
 const DEFAULT_PAYER_PATH = "keypair.json";
 const AIRDROP_LAMPORTS = 2000000000n;
+const AIRDROP_RETRIES = 3;
 const MIN_DEPLOY_BALANCE = 1500000000n;
 async function deploy(options) {
 	intro("better-sol deploy");
@@ -3208,14 +3216,19 @@ async function ensureFunded(address, cluster, rpcUrl) {
 		return;
 	}
 	s.message(`Low balance (${(Number(balance) / 1e9).toFixed(4)} SOL). Requesting airdrop on ${cluster}...`);
-	try {
+	for (let attempt = 1; attempt <= AIRDROP_RETRIES; attempt++) try {
 		await confirmSignature(await requestAirdrop(address, rpcUrl, AIRDROP_LAMPORTS), rpcUrl);
 		const newBalance = await getBalance(address, rpcUrl);
 		s.stop(`Funded. Balance: ${(Number(newBalance) / 1e9).toFixed(2)} SOL`);
+		return;
 	} catch {
-		s.stop("Airdrop failed");
-		throw new Error(`Failed to airdrop SOL on ${cluster}. Fund ${address} manually or try again.`);
+		if (attempt < AIRDROP_RETRIES) {
+			s.message(`Airdrop attempt ${attempt} failed, retrying...`);
+			await new Promise((resolve) => setTimeout(resolve, 2e3));
+		}
 	}
+	s.stop("Airdrop failed");
+	throw new Error(`Failed to airdrop SOL on ${cluster}. Fund ${address} manually or try again.`);
 }
 function printProgramSummary(program, cluster, out, wroteRust) {
 	log.info(`Program: ${program.name}`);
@@ -69246,7 +69259,7 @@ async function gitCommit() {
 //#endregion
 //#region src/index.ts
 const cli = new Command();
-cli.name("better-sol").description("TypeScript-first Solana program tooling — run with npx @better-sol/cli").version("0.1.0-alpha.1");
+cli.name("better-sol").description("TypeScript-first Solana program tooling — run with npx @better-sol/cli").version("0.1.0-alpha.5");
 cli.command("init").description("Initialize a better-sol project").option("--force", "overwrite existing files", false).option("--skip-install", "skip installing dependencies", false).action((options) => run(() => init(options)));
 cli.command("create").description("Create a new better-sol program").argument("[name]", "program name").option("--dir <dir>", "program directory", "programs").option("--force", "overwrite existing files", false).action((name, options) => run(() => create(name, options)));
 cli.command("login").description("Save your compiler API key").action(() => run(() => login()));
@@ -69255,7 +69268,7 @@ const generate = cli.command("generate").description("Generate derived artifacts
 generate.command("db").description("Generate a database schema from account definitions").option("--dialect <dialect>", "postgres, mysql, or sqlite", "postgres").option("--out <path>", "output file", "src/db/better-sol.ts").option("--src <glob>", "program source glob").action((options) => run(() => generateDb(options)));
 generate.command("idl").description("Generate a typed Better Sol program from an IDL file or on-chain program address").argument("<source>", "path to IDL JSON file or on-chain program address").option("--out <path>", "output TypeScript file (default: generated/<name>.ts)").option("--name <name>", "program name override (default: derived from IDL)").option("--cluster <cluster>", "cluster for on-chain IDL fetch (mainnet, devnet, testnet, localnet)", "mainnet").action((source, options) => run(() => generateIdl(source, options)));
 cli.command("verify").description("Submit a deployed program for OtterSec verified-builds").argument("[program]", "program name or program ID").option("--program-id <programId>", "program ID to verify").option("--lib-name <name>", "Rust library name (defaults to program name)").option("--mount-path <path>", "subdirectory in repo where Cargo.toml lives (defaults to generated/<name>)").action((program, options) => run(() => verify(program, options)));
-if (process.argv[1] !== void 0 && fileURLToPath(import.meta.url) === process.argv[1]) cli.parse(process.argv);
+cli.parse(process.argv);
 async function run(task) {
 	try {
 		await task();